03-02-2012
On an HP system there is big chance (99% ? ) it be /tmp...
You did not say OS version platform nor size of files you are trying to merge...
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
I need help writing a bash script for the windows cygwin environment. I'm not sure if bash is the optimal tool. Perhaps perl would be better? Either would work.
I have directories whose names include the date they were created. The directory names are in the format of... (0 Replies)
Discussion started by: siegfried
0 Replies
2. UNIX for Dummies Questions & Answers
Hi,
I need to sort all the files in a directory whilst retaining the originals. So if in the directory I have:
File1
File2
File3
I want to sort these files so that I would have:
File1
File1.sort
File2
File2.sort
File3
File3.sort
where I have added the .sort extension to show... (4 Replies)
Discussion started by: ledgie
4 Replies
3. Shell Programming and Scripting
hi there,
I have a directory which contents I can parse dynamically. I end up with a file list. I then want to display those files sorted by date, oldest files first. I have very very little PERL experience...Would anyone know how to do that ? Thanks in advance. (8 Replies)
Discussion started by: alexf
8 Replies
4. UNIX for Dummies Questions & Answers
Hi ,
I have a list of files in the directory I want to sort based on the file name.
But in the middle of filename contains the number based on that I need to sort.Could you suggest me on the same?
Example filenames:
/user1$ls
RS.DEV.ISV.F1.RS.REFDATA.DATA... (1 Reply)
Discussion started by: praveen.thumati
1 Replies
5. UNIX for Dummies Questions & Answers
Hi,
I have directories with name like:
aaa
bbb
ccc
...
I would like to to see which directories are the largest and then list the files within each. I have success using:
du -ks * | sort -rin | head -n 20
which gives me an output like:
120 bbb
27 ccc
3 aaa
...
I would like... (3 Replies)
Discussion started by: ChatPerdu
3 Replies
6. Shell Programming and Scripting
Hi to all.
I'm trying to sort this with the Unix command sort.
user1:12345678:3.5:2.5:8:1:2:3
user2:12345679:4.5:3.5:8:1:3:2
user3:12345687:5.5:2.5:6:1:3:2
user4:12345670:5.5:2.5:5:3:2:1
user5:12345671:2.5:5.5:7:2:3:1
I need to get this:
user3:12345687:5.5:2.5:6:1:3:2... (7 Replies)
Discussion started by: daniel.gbaena
7 Replies
7. Shell Programming and Scripting
Hello Everybody :) !!!. i have question in mind, is it possible to sort a list of hexadecimal numbers using "sort" command? (9 Replies)
Discussion started by: Kesavan
9 Replies
8. UNIX for Dummies Questions & Answers
Hey Guys,
I am facing an annoying scenario, fewer times when I execute the sort command, it throws out on error saying that "No Space on available on /var/tmp/<temp file name>. May be it is set to /var/tmp directory. I was wondering, if I cant redirect the temporary file creation to any other... (3 Replies)
Discussion started by: abhisheksunkari
3 Replies
9. UNIX for Beginners Questions & Answers
OS : RHEL 6.6
I want to list the files/directories sorted (Ascending or Desceding) by their size.
As you can see in the below example, du command doesn't sort by size.
In Linux world, is there any other command or workaround using du command to list the files/directories sorted by their... (6 Replies)
Discussion started by: John K
6 Replies
10. UNIX for Beginners Questions & Answers
Trying to sort a bunch of files numerically but can't seem to get the command just right. This is in a IBM AIX machine.
I have a directory that has...
backup.bk1
backup.bk100
backup.bk2
backup.bk200
backup.bk3
backup.bk300
There are a lot more files but this is shortened for the... (5 Replies)
Discussion started by: c3rb3rus
5 Replies
LEARN ABOUT MOJAVE
git-merge-file
GIT-MERGE-FILE(1) Git Manual GIT-MERGE-FILE(1)
NAME
git-merge-file - Run a three-way file merge
SYNOPSIS
git merge-file [-L <current-name> [-L <base-name> [-L <other-name>]]]
[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
[--[no-]diff3] <current-file> <base-file> <other-file>
DESCRIPTION
git merge-file incorporates all changes that lead from the <base-file> to <other-file> into <current-file>. The result ordinarily goes into
<current-file>. git merge-file is useful for combining separate changes to an original. Suppose <base-file> is the original, and both
<current-file> and <other-file> are modifications of <base-file>, then git merge-file combines both changes.
A conflict occurs if both <current-file> and <other-file> have changes in a common segment of lines. If a conflict is found, git merge-file
normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like
this:
<<<<<<< A
lines in file A
=======
lines in file B
>>>>>>> B
If there are conflicts, the user should edit the result and delete one of the alternatives. When --ours, --theirs, or --union option is in
effect, however, these conflicts are resolved favouring lines from <current-file>, lines from <other-file>, or lines from both
respectively. The length of the conflict markers can be given with the --marker-size option.
The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that
many conflicts). If the merge was clean, the exit value is 0.
git merge-file is designed to be a minimal clone of RCS merge; that is, it implements all of RCS merge's functionality which is needed by
git(1).
OPTIONS
-L <label>
This option may be given up to three times, and specifies labels to be used in place of the corresponding file names in conflict
reports. That is, git merge-file -L x -L y -L z a b c generates output that looks like it came from files x, y and z instead of from
files a, b and c.
-p
Send results to standard output instead of overwriting <current-file>.
-q
Quiet; do not warn about conflicts.
--diff3
Show conflicts in "diff3" style.
--ours, --theirs, --union
Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines.
EXAMPLES
git merge-file README.my README README.upstream
combines the changes of README.my and README.upstream since README, tries to merge them and writes the result into README.my.
git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345
merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels a and c instead of tmp/a123 and tmp/c345.
GIT
Part of the git(1) suite
Git 2.17.1 10/05/2018 GIT-MERGE-FILE(1)