Mike's code review comments

[mernst]

Merge #207 first.

[benedikt-schesch]

@mernst There is some logic I don't understand in src/scripts/merge_tools/resolve-import-conflicts-in-file.py and src/scripts/merge_tools/resolve-import-conflicts.
We have:

  if ! "${SCRIPTDIR}"/resolve-import-conflicts-in-file.py "$file" ; then
    status=1
  fi

Which means that we are waiting for the script to exit with non-zero status. I believe this should happen in case we don't handle a merge. Looking at the script, the only case the script will leave with non-zero status is in case the number of parameters is not 1 (which won't happen in this case, ~line 20) or in case a conflict marker is missing (which also shouldn't happen, assert line ~107). I see no statement to exit the code in case we don't handle a merge. Is this a bug, or is it something I don't understand?

[mernst]

@mernst There is some logic I don't understand in src/scripts/merge_tools/resolve-import-conflicts-in-file.py and src/scripts/merge_tools/resolve-import-conflicts.

Thanks for catching this. Please see #217 .