09-02-2016
Thanks RavinderSingh13, you saved my day
10 More Discussions You Might Find Interesting
1. Shell Programming and Scripting
Hi,Iam new to Unix.I have a file FileA which is a variable length file where each column is seperated by delimitter "|".
FileA:
SrNo Name Address
1-234|name1|Addr1
1-34|name2|Addr2
1-2345|name3|Addr3
FileB:
SrNo Address
1-34<<06 SPACES>>Addr1<<8 spaces>>
1-234<<05... (1 Reply)
Discussion started by: swapna321
1 Replies
2. Shell Programming and Scripting
Hi All:
I have following files:
File 1:
<header>
text...
text ..
text ..
text ..
<\header>
x
y
z
...
File 2:
<header>
text...
text ..
text .. (4 Replies)
Discussion started by: mrn006
4 Replies
3. UNIX for Dummies Questions & Answers
Dear Friends,
I really do not know Linux and I really would like to understand it because it does help to work with large data. I am reading this forum for 1 week to try a solution for my problem. I think that, using others post informations, I was almost there...
I have 2 big tables... (4 Replies)
Discussion started by: lColli
4 Replies
4. Shell Programming and Scripting
I had two files 1.txt 2.txt. I want a 3rd file(o/p) 3.txt like below (using awk)
1.txt
11 a1
12 a2
13 a3
14 a4
15 a5
16 a6
17 a7
18 a8
19 a9
20 a10
2.txt
14 b1
15 b2
16 b3 (8 Replies)
Discussion started by: p_sai_ias
8 Replies
5. Shell Programming and Scripting
I had two files 1.txt 2.txt. I want a 3rd file(o/p) 3.txt like below based on the common elements from the first coulmns of 1.txt and 2.txt.
1.txt
11
12
13
14
15
16
17
18
19
20
21
2.txt (6 Replies)
Discussion started by: p_sai_ias
6 Replies
6. Shell Programming and Scripting
I have the following space-delimited input:
1 11.785710 117.857100
1 15 150
1 20 200
1 25 250
3 2.142855 21.428550
3 25 250
22 1.071435 10.714350
The first field is the ID number, the second field is the percentage of the total points that the person has and the third column is the number... (3 Replies)
Discussion started by: mdlloyd7
3 Replies
7. UNIX for Dummies Questions & Answers
I have 2 files,
file01= 7 columns, row unknown (but few)
file02= 7 columns, row unknown (but many)
now I want to create an output with the first field that is shared in both of them and then subtract the results from the rest of the fields and print there
e.g.
file 01
James|0|50|25|10|50|30... (1 Reply)
Discussion started by: A-V
1 Replies
8. UNIX for Dummies Questions & Answers
Dear all,
I have a simple question. I have a file like below (separated by tab):
col1 col2 col3 col4 col5 col6 col7
21 66745 rs1234 21 rs5678 23334 0.89
21 66745 rs2334 21 rs9978 23334 0.89
21 66745 ... (4 Replies)
Discussion started by: forevertl
4 Replies
9. UNIX for Dummies Questions & Answers
Hello :)
I am in this situation:
Input: two tab-delimited files, `File1` and `File2`. `File2` (`$2`) has to be parsed by patterns found in `File1` (`$1`).
Expected output: tab-delimited file, `File3`. `File3` has to contain the same rows as `File2`, plus the corresponding value in... (5 Replies)
Discussion started by: dovah
5 Replies
10. Shell Programming and Scripting
Hi ,
I need to add few new columns in existing file .Any help would be great
ex:
existing file
name,typ,add,dept
New file(com1,sal are new)
name,com1,type,sal,add,dept
Thanks,
mohan (1 Reply)
Discussion started by: mohan705
1 Replies
LEARN ABOUT MOJAVE
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)