Does anyone know of any decent online tutorials with regard to Solaris and/or Oracle, currently I'm just hamming my way through but would like to get some more in depth knowledge of the subjects.
And as I'm sat at work all day with nothing to do, I thought I'd give the old brain a workout before... (1 Reply)
i just got used to some basic unix commands etc
i wanted to learn shell programming
i bought the book but it looks like full of command reference and doesn't teach how to do shell scripting
any good ones in this site or over the web .
thank you
siva (1 Reply)
Can anyone give me the link to a website having gdb tutorials
(for advanaced debugging & shortcuts)
http://www.burneddowndays.com/talk/YaBBImages/rolleyes.gif (1 Reply)
Hi..
I required Cygwin User Guide and Reference Materials.If anybody knows the related URL Kindly help me.
Thanks & Regards :)
Sanjay.Karthik (1 Reply)
Hi ,
I would like to know how to write encrytion functions in c++ in linux environment.so would like u get some tutorials on the topic.
Can anyone help (1 Reply)
My project uses Autosys.
I am new to this product and I don't know where to start from.
Q1. Please provide me the link where I can get Autosys documentation
Q2. Please refer a good book on Autosys. (Beginner/Intermediate Level) (0 Replies)
All the autosys jobs are on server-1 and server-1 has been crashed due to some reason, Now I have to run 5 autosys jobs on server-2 (failover server) which are on server 1.
How to do with Autosys command (which command needs to fired on JIL) (0 Replies)
Does anyone have any good .NET Tutorials? What are some good websites for .NET Tutorials? (0 Replies)
Discussion started by: cokedude
0 Replies
LEARN ABOUT HPUX
merge
merge(1) General Commands Manual merge(1)NAME
merge - three-way file merge
SYNOPSIS
file1 file2 file3
DESCRIPTION
combines two files that are revisions of a single original file. The original file is file2, and the revised files are file1 and file3.
identifies all changes that lead from file2 to file3 and from file2 to file1, then deposits the merged text into file1. If the option is
used, the result goes to standard output instead of file1.
An overlap occurs if both file1 and file3 have changes in the same place. prints how many overlaps occurred, and includes both alterna-
tives in the result. The alternatives are delimited as follows:
lines in file1
lines in file3
If there are overlaps, edit the result in file1 and delete one of the alternatives.
This command is particularly useful for revision control, especially if file1 and file3 are the ends of two branches that have file2 as a
common ancestor.
EXAMPLES
A typical use for is as follows:
1. To merge an RCS branch into the trunk, first check out the three different versions from RCS (see co(1)) and rename them for
their revision numbers: 5.2, 5.11, and 5.2.3.3. File 5.2.3.3 is the end of an RCS branch that split off the trunk at file 5.2.
2. For this example, assume file 5.11 is the latest version on the trunk, and is also a revision of the "original" file, 5.2.
Merge the branch into the trunk with the command:
3. File 5.11 now contains all changes made on the branch and the trunk, and has markings in the file to show all overlapping
changes.
4. Edit file 5.11 to correct the overlaps, then use the command to check the file back in (see ci(1)).
WARNINGS
uses the ed(1) system editor. Therefore, the file size limits of ed(1) apply to
AUTHOR
was developed by Walter F. Tichy.
SEE ALSO diff3(1), diff(1), rcsmerge(1), co(1).
merge(1)