Great! Thank you!
Ken On Oct 13, 10:15 am, Konstantin Khomoutov <[email protected]> wrote: > On Oct 13, 9:05 pm, Ken <[email protected]> wrote: > > > Well, not "the same" but that my changes have been merged... > > Depends on what you will consider as being merged, really. > This is because you're free to stuff the conflicting file using any > contents you want and then commit this. > So you can verify the state just by peering into the files which were > merged. > Also you could do > $ git diff HEAD^ > to see the diff between the HEAD and the first parent of the HEAD > (which is the HEAD's state prior to merge). -- 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.
