I get conflicts when trying to merge:  https://gist.github.com/3301009

What I want to do is to take commit x to branch 4 and put it "ontop"(?) of 
commit y on branch "master."  Is that not a merge?

What does it matter when there's a conflict, isn't that the very meaning of 
merge, that you are saying, yes, these two things are different, replace 
"this one" with "that one"?

When would have a merge *without* conflicts, and why?



You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to