Thank You Very much :) On Oct 26, 3:38 pm, Konstantin Khomoutov <[email protected]> wrote: > On Oct 26, 11:26 am, Chandu80 <[email protected]> wrote: > > > I have two files rpc-devexprcpseq-nav.rb and readme.txt. > > My workflow is as follows. > [...] > > Auto-merging lib/rpc-devexprcpseq-nav.rb > > CONFLICT (content): Merge conflict in lib/rpc-devexprcpseq-nav.rb > > Auto-merging readme.txt > > CONFLICT (content): Merge conflict in readme.txt > > Automatic merge failed; fix conflicts and then commit the result. > > > In order to resolve this merge conflict do I need to remove the > > spacing in the code???? > > "The conflict" means Git sees the changes were made to the same > portions of the same file in both branches participaring in the merge > process. > So you're thinking in the wrong direction -- you should try hard to > understand what's the essense of the concept of conflicts in VCS is, > and then the idea about resolving them comes naturally. > In your case, you should decide what contents the merged version of > the file should have and then make it have that contents. > > > As I am new to git,I want to know what does the following indicate? > > <<<<<<< HEAD > > ======= > > >>>>>>> work > > > These have been introduced in both the files after the merge. > > This indicates a chunk which contains one of the conflicting changes, > that is, > the file in the checked out branch contains the text between > > <<<<<<< HEAD > ======= > > and the file being merged contains the text between > > ======= > > >>>>>>> work > > at the same place in the file -- that's why there is the conflict in > the first place. > Now you have to decide which version of this chunk should end up in > the resulting > file by deleting one of the pieces and all the conflict markers. Or > you might decide that the text from both pieces should be somehow > naturally merged, say, out of > > <<<<<<< HEAD > one > two > four > wrong > ======= > three > five > > >>>>>>> work > > you might decide that the resulting chunk has to be > > one > two > three > four > five > > that is, both pieces intermixed and the "wrong" line deleted. > > As you are new to Git, start from reading books -- "Basic Merge > Conflicts" in [1], for instance. Also see [2] for instance -- it > discusses how to pick one "side" of the file being merged over another > without the need to deal with conflict markers, and merging binary > files. > > 1.http://progit.org/book/ch3-2.html > 2.http://groups.google.com/group/git-users/msg/12c06fe985f4ff45
-- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
