Merge conflict in a file that has not been modified in any branch

Question

When I try to rebuild the branch featureXon master, I get a conflict in the file (let it be called moduleA/foo) that has not been changed either master, either featureX, since they diverged! I checked this with the following log command:

git log master...featureX -- moduleA/foo

and the result was empty (no commit of any branches touched the file, as the branches diverged).

How is this even possible and what can I do to avoid such misleading conflicts?

Answer 1

As @Xlee said, it rebasecan lead to a change in the hash of the commit and confusion with the story.

, :
- featureX
- - , moduleA/foo master
- GIT - .