Code review

.github/workflows/test.yml

@@ -19,7 +19,6 @@ jobs:
         run: |
           git config --global user.email "example@example.com"
           git config --global user.name "Example Example"
-          # TODO: reinstate `make test` and remove the other `make` calls
+          # TODO: reinstate `make test` and remove the other `make` calls.
           # make test
-          make -C tests/resolve-adjacent-conflicts-test
-          make -C tests/resolve-import-conflicts-test
+          make -C tests/resolve-adjacent-conflicts-test && make -C tests/resolve-import-conflicts-test

.gitignore

@@ -3,17 +3,3 @@
 
 tests/**/Merged*.diff
 tests/**/Merged*.java
-tests/lint-diff-test/guessstrip-lint-pruned.txt
-tests/lint-diff-test/reldir-lint-pruned.txt
-tests/lint-diff-test/words-lint.txt
-tests/lint-diff-test/words1.txt
-tests/lint-diff-test/words12-diff.txt
-tests/lint-diff-test/words2-lint-pruned.txt
-tests/lint-diff-test/words2-lint-pruned.txt-goal
-tests/lint-diff-test/words2-lint-pruned.txt-goal-nofilename
-tests/lint-diff-test/words2-lint-pruned.txt-nofilename
-tests/lint-diff-test/words2-lint.txt
-tests/lint-diff-test/words2.txt
-tests/**/Merged*.java
-tests/**/Merged*.diff
-tests/sort-compiler-output-test/errors1-sorted.actual

resolve-conflicts.py

@@ -101,7 +101,7 @@ def main() -> None:
                     i += num_lines
 
         tmp.close()
-        shutil.copy(tmp.name, filename)
+        shutil.copyfile(tmp.name, filename)
         Path(tmp.name).unlink()
 
     if conflicts_remain: