I like pipes (and cats I like too ):
POSIX shell and GNU sed (-r option for ERE - extended regular expressions). Change ERE to BRE if you don't have it.
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... (7 Replies)
Hi
I have two tab delimited file with different number of columns but same number of rows. I need to combine these two files in such a way that row 1 in file 2 comes adjacent to row 1 in file 1.
For example:
The content of file1:
field1 field2 field3
a1 a2 a3
b1 b2 b3... (2 Replies)
Hi,
I have two files that I would like to merge and think that there should be a solution using awk. The files look something like this:
file 1
IDX1 IDY1
IDX2 IDY2
IDX3 IDY3
file 2
IDY1 dataA data1
IDY2 dataB data2
IDY3 dataC data3
Desired output
IDX1 IDY1 dataA data1
IDX2 ... (5 Replies)
Dear Perl users,
I need your help to solve my problem below.
I want to print the sequence number without missing number within the range.
E.g. my sequence number :
1 2 3 4 5 6 7 8 11 12 13 14
my desired output:
1 -8 , 11-14
my code below but still problem with the result:
1 - 14
1 -... (2 Replies)
Hi Power User,
I'm trying to compute this kind of text file format:
file1:
jakarta 100 150
jakarta 170 210
beijing 220 250
beijing 260 280
beijing 290 320
new_york 330 350
new_york 370 420
tokyo 430 470
tokyo 480 ... (2 Replies)
i have a file with some number of colums and each row have different number of fields.
now my target is supposed to be, each row should have same number of columns.
example:
src file:
111,S3mobile,Samsu
ng
112,Lu
mia,Nok
ia
113,brav
ia,Sonyerichson
tgt file:
111,S3mobile,Samsung... (8 Replies)
Hi
I want to use awk to match where field 3 contains a number within string - then print the line and just the number as a new field.
The source file is pipe delimited and looks something like
1|net|ABC Letr1|1530|||
1|net|EXP_1040 ABC|1121|||
1|net|EXP_TG1224|1122|||
1|net|R_North|1123|||... (5 Replies)
Hi experts,
I am using KSH and I am need to display file with number in front of file names and user can select it by entering the number.
I am trying to use following command to display list with numbers. but I do not know how to capture number and identify what file it is to be used for... (5 Replies)
Discussion started by: mysocks
5 Replies
LEARN ABOUT XFREE86
git-merge-index
GIT-MERGE-INDEX(1) Git Manual GIT-MERGE-INDEX(1)NAME
git-merge-index - Run a merge for files needing merging
SYNOPSIS
git merge-index [-o] [-q] <merge-program> (-a | [--] <file>*)
DESCRIPTION
This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA-1 hash for those files as arguments 1, 2, 3
(empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7.
OPTIONS --
Do not interpret any more arguments as options.
-a
Run merge against all files in the index that need merging.
-o
Instead of stopping at the first failed merge, do all of them in one shot - continue with merging even when previous merges returned
errors, and only return the error code after all the merges.
-q
Do not complain about a failed merge program (a merge program failure usually indicates conflicts during the merge). This is for
porcelains which might want to emit custom messages.
If git merge-index is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit
code.
Typically this is run with a script calling Git's imitation of the merge command from the RCS package.
A sample script called git merge-one-file is included in the distribution.
ALERT ALERT ALERT! The Git "merge object order" is different from the RCS merge program merge object order. In the above ordering, the
original is first. But the argument order to the 3-way merge program merge is to have the original in the middle. Don't ask me why.
Examples:
torvalds@ppc970:~/merge-test> git merge-index cat MM
This is MM from the original tree. # original
This is modified MM in the branch A. # merge1
This is modified MM in the branch B. # merge2
This is modified MM in the branch B. # current contents
or
torvalds@ppc970:~/merge-test> git merge-index cat AA MM
cat: : No such file or directory
This is added AA in the branch A.
This is added AA in the branch B.
This is added AA in the branch B.
fatal: merge program failed
where the latter example shows how git merge-index will stop trying to merge once anything has returned an error (i.e., cat returned an
error for the AA file, because it didn't exist in the original, and thus git merge-index didn't even try to merge the MM thing).
GIT
Part of the git(1) suite
Git 2.17.1 10/05/2018 GIT-MERGE-INDEX(1)