Dears, I am facing situations in which only one of the developers/branches changes a specific file, but git merge reports a merge conflict for that file. So, why is git reporting conflict for files not mutually changed? In the example below, the file "OutOfTimeCrossValidatorRunner.java" (underlined in red) is changed by only one of the parents of a merge commit, but git merge still reports a conflict for that file as you can see in the bottom of the image. As further observation, I printed the temporary files used/passed to git merge, and I noted that they are different from the files present in the commits. Thanks in advance.
-- 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. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/bd62af4b-05e1-492f-9db4-0f52d7d56ef9%40googlegroups.com.
