When trying to merge /pom.xml on branch R1 to branch R2 git didn't detect 
the merge and tried to put the changes into /pom.xml on R2.  I am guessing 
this is because when it went to merge /pom.xml on R1 to R2 it found a 
/pom.xml on R2 and did not bother to attempt any rename logic.  

On R1 /pom.xml is the webapp's pom.xml file.  On R2 /pom.xml is the parent 
pom.xml file.  It makes no sense to try and merge two different files 
together.  

I would be surprised if it was an msysgit issue, but I provide it for 
context.

-- 
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/d/optout.

Reply via email to