want to merge two consecutive lines. Post: 302310504

10 More Discussions You Might Find Interesting

1. Shell Programming and Scripting

Appending Consecutive lines

Hi, I have a file containing a single field on every row. What I need is to append one on to the end of another, e.g. The input file looks like this: nnnnn mmmmmm nnnnn mmmmmm I need it to look like this: nnnnn mmmmmm nnnnn mmmmmm Any ideas would be much appreciated,...

2. UNIX Desktop Questions & Answers

How to concatenate consecutive lines

I have a few lines like -- feature 1, subfeat 0, type 3, subtype 1, value 0, -- feature 1, subfeat 0, type 1, subtype 1, value 0, I would like to concatenate the...

3. Shell Programming and Scripting

Merge two non-consecutive lines

Hello - First post here. I need help combining two lines that are non-consecutive in a file. Using sed, awk or perl preferably. So the file looks as follows. Please note, the "Line#:" is there only for reference. The lines can only be distinguished by whether they have "start" or "done" in...

4. Shell Programming and Scripting

Merge two non-consecutive lines based on line number or string

This is a variation of an earlier post found here: unixcom/shell-programming-scripting/159821-merge-two-non-consecutive-lines.html User Bartus11 was kind enough to solve that example. Previously, I needed help combining two lines that are non-consecutive in a file. Now I need to do the...

5. Shell Programming and Scripting

Removing consecutive lines in a file

We have very large transaction logs that have transactions which start with a line that starts with 'Begin :' and ends with a line that starts with 'End :'. For most transactions there is valid data between those two lines. I am trying to get rid of lines that look like this: Begin :...

6. Shell Programming and Scripting

Grep couple of consecutive lines if each lines contains certain string

7. UNIX for Dummies Questions & Answers

Matching two patterns in the consecutive lines

Hi Experts I need to match 2 patterns consecutively and display 25 lines after that. 1st one - Error 2nd one - End string ( comes along with the pattern one) 3rd one - error Logic grep "ERROR OCCURRED :" trace.log | awk -v "ES=:" -v "SS=java.lang.NullPointerException" '{ if($NF ~...

8. UNIX for Dummies Questions & Answers

Eliminate consecutive lines with the same pattern

Hi, I would like to know how to remove lines which has the same pattern as the next line through sed/awk. Stream 39 (wan stream 7) Stream 40 (wan stream 8) WINQ Counter 115955 1 1613 (BYTE) 11204787 163 ...

9. Shell Programming and Scripting

Removing 3 consecutive lines from script

Hi I need to remove three consecutive lines of code which appear multiple times during a script. Two of the lines also appear in other parts of the scripts and need to stay so I can't strip out the code per se - It needs to be the exact three lines. Hope that makes sense ! Any help much...

10. Shell Programming and Scripting

Grep three consecutive lines if each lines contains certain string

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)