| .. | ||
| test | ||
| README.md | ||
| run.sh | ||
Auto rebase script
The ./run.sh script in this directory rebases the current branch onto a target branch,
while automatically resolving merge conflicts caused by marked commits in .git-blame-ignore-revs.
See the header comment of that file to understand how to mark commits.
This is convenient for resolving merge conflicts for pull requests after e.g. treewide reformats.
Testing
To run the tests in the test directory:
$ cd test
$ nix-shell
nix-shell> ./run.sh