I've been experiencing some weird merges lately, where Git's automatic 
three-way merge will take the wrong change. 

Let's say I created a branch *develop* off of *master*. Here's the 
situation given a line in a particular file:

*develop:* line has no change
*master:* line changed

I am on *develop* and I do git pull origin master. There won't be any merge 
conflicts for that file, but Git will ignore the change on branch-B and 
keep mine.

It SEEMS like Git is using the "ours" merge strategy, but there is nowhere 
I am specfiying to use this merge strategy, including in my git config. 
It's also not happening consistently.

Has anyone experienced this before or have any insight? I can provide more 
information if necessary.

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