Thanks for your reply
It is very difficult and complicate to reproduce the situation.
I'm on version 1.9.0. And I'm also tried on 1.8.x
Thanks to good way. Is there any way that resolve using git command like
you mentioned that git checkout file --theirs.
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
For more options, visit https://groups.google.com/groups/opt_out.