On Thu, 12 Dec 2013 03:40:24 -0800 (PST)
THUFIR HAWAT <hawat.thu...@gmail.com> wrote:

> Why didn't it say that there were conflicts?  I mean, the files were
> totally different.

And one more aspect to this, which I forgot to point out...
Git *would* take differences in files when doing a merge *if* it would
do the actual merging but it did not do the merging, and I tried to
explain exactly why it didn't.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to