This is a question about software development.
The merge command puts merge markers only when there is a conflict,
resolving the conflict means to decide what code to put in its place. No
problem.
The problem is that merge automatically changes the file in some cases without
markers. For me the only way to go would be to use diff to find the changes and
review the program as a whole. But it seems that is not what software developers do.
The merge command puts merge markers only when there is a conflict,
resolving the conflict means to decide what code to put in its place. No
problem.
The problem is that merge automatically changes the file in some cases without
markers. For me the only way to go would be to use diff to find the changes and
review the program as a whole. But it seems that is not what software developers do.