01-06-2010
J will merge 2 lines .
Go to the end of line , press J and next line will be appended .
I am not sure you want to do it for large file manually .
10 More Discussions You Might Find Interesting
1. Programming
Hi all,
I have a problem in handling files through C.
here is the problem im having:
i will query the database (for instance consider employees table )
for empno,ename,job,salary fields.The query returns me some 100 of rows. now i need to place them in a file in row wise pattern as they... (3 Replies)
Discussion started by: trinath
3 Replies
2. Programming
Hi all,
I got a little issue here. Imagine that I have more than one process accessing one file. Is it possible to know which process(es) are accessing that file when I open the file??
Thanks for the help.
Best regards,
Ernesto (2 Replies)
Discussion started by: ninjanesto
2 Replies
3. Shell Programming and Scripting
Hi All,
I am running a script , working very fine on cmd prompt. The problem is that when I open do crontab -e even after setting editor to vi by
set EDITOR=vi it does not open a vi editor , rather it do as below.....
/////////////////////////////////////////////////////
$ set... (6 Replies)
Discussion started by: aarora_98
6 Replies
4. UNIX for Advanced & Expert Users
Hi,
I have a log file which runs into 3 to 5 GB.
We store this typically for 6 months. When a new month starts we move the previous month into a 9 month back up log (file.9m) and delete the last month of the 9 month back up.
Iam using awk to find the data and cat to join the files like... (3 Replies)
Discussion started by: baanprog
3 Replies
5. UNIX for Advanced & Expert Users
sir i have to get first line from a file
for example
>cat file1
abc
zxc
asd
adsf
from that file1 i need only first line
expected result
>abc
please help me ! (1 Reply)
Discussion started by: ponmuthu
1 Replies
6. UNIX for Advanced & Expert Users
my input for a script is another csv file
but in that file say 7 lines are there ...
how can i get line by line to that input
for example :
>cat link.csv
www.yahoo.com,yahoo
www.google.com,google
www.unix.com,unix
another file
in that file i need to ping the above links
... (2 Replies)
Discussion started by: ponmuthu
2 Replies
7. Shell Programming and Scripting
I have been doing automation of daily check activity for a server, i have been using sqls to retrive the data and while loop for reading the data from the file for several activities. BUT i got a show stopper the below one.. where the data is getting store in $temp_file, but not being read by while... (1 Reply)
Discussion started by: KuldeepSinghTCS
1 Replies
8. UNIX for Dummies Questions & Answers
Hi Team,
I am trying to cut a large file into multiple files. It has
Header
50,050 records
Trailer
-------------------------------------------
I need to cut the files into multiple files of 1000 records and should have the same header and trailer as the original files.
... (4 Replies)
Discussion started by: Gurkamal83
4 Replies
9. UNIX for Dummies Questions & Answers
I have a file
1
298167
298168
1093209
1093210
1422663
I want to write a code where in I want to read contents of above file
like first read is 1
second read is 298167
Substract second read from first and if this is greater than or less than 99,999.
Similarly I want to traverse thru... (3 Replies)
Discussion started by: Guru148
3 Replies
10. Shell Programming and Scripting
Hi All,
I need to extract the data from the text file. The data of the text file is shown below
#L 0.000017 4.329939 0.000017 4.716267 r7.9 P 1 1;Net=IN32
The extracted data should be IN32. Could anyone help to script in c shell.? (4 Replies)
Discussion started by: gopishrine
4 Replies
LEARN ABOUT OSX
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)