Hi Philip! Thanks for the response. You are talking about different files: the file with (2+-) changes is "OutOfTimerCrossValidator.java" and the file in conflict is "OutOfTimeCrossValidator*Runner*.java".
I found this on the documentation (https://git-scm.com/docs/merge-strategies), perhaps this is the case: > > *With the strategies that use 3-way merge (including the default, > recursive), if a change is made on both branches, but later reverted on one > of the branches, that change will be present in the merged result; some > people find this behavior confusing. It occurs because only the heads and > the merge base are considered when performing a merge, not the individual > commits. The merge algorithm therefore considers the reverted change as no > change at all, and substitutes the changed version instead.* > Em segunda-feira, 25 de maio de 2020 13:46:26 UTC-3, Philip Oakley escreveu: > > In the Merge Left marker it shows a very small change (2+-) for that file, > at least I think that's the file. > > Did you expect that? What was the change? Was it a white space or end of > line (eol) change)? > > You may have a 3-way merge (mergebase, left and right commits) detecting > the white space anomaly. > > P. > > On Monday, May 25, 2020 at 5:05:21 PM UTC+1, Guilherme Cavalcanti wrote: >> >> 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/86dc5f99-fd0a-4b5a-a087-704103e02fde%40googlegroups.com.
