I observed the situation when I cherry-picked a commit from my dev branch 
into a master  - a commit that had  conflicting information with master (it 
touched the same line in a file). - and I did not get a "merge conflict" 

1) First I cloned the remote repo and had both master and dev identical to 
one another.
2) (on master) Rebased the master against some other branch that put a new 
commit (that wasn't there in the dev branch on top of it). I then modified 
and old file -  test.txt and committed it. 
3)(on dev) Switched to dev branch. Modified test.txt and committed it. 
4) (on master) Switched back to master and cherry picked the commit for 
test.txt into master. My test.txt on the master now is overridden with the 
one from dev. I though I should get a "merge conflicts" message?

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