Skip to content

Code review #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mernst merged 7 commits into from
Jul 7, 2026
Merged

Code review #46

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
68ba240
Code review
mernst Jul 4, 2026
c29da14
Disable test of `git-clone-related` under GitHub Actions
mernst Jul 6, 2026
74b4299
Merge ../git-scripts-branch-disable-gitclonerelated-test into code-re…
mernst Jul 6, 2026
e4f9b7d
Don't use `MAKE` variable
mernst Jul 6, 2026
2a2cf2c
Merge ../git-scripts-branch-disable-gitclonerelated-test into code-re…
mernst Jul 6, 2026
d4e428a
Don't skip failures
mernst Jul 6, 2026
4ca3f95
Merge ../git-scripts into code-review
mernst Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@ jobs:
run: |
git config --global user.email "example@example.com"
git config --global user.name "Example Example"
make test
# 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
Comment thread
mernst marked this conversation as resolved.
Outdated
14 changes: 0 additions & 14 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion resolve-conflicts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down