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
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
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"
