pyrox.dev
1# Auto rebase script
2
3The [`./run.sh` script](./run.sh) 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`](../../../.git-blame-ignore-revs).
4See the header comment of that file to understand how to mark commits.
5
6This is convenient for resolving merge conflicts for pull requests after e.g. treewide reformats.
7
8## Testing
9
10To run the tests in the [test directory](./test):
11```
12$ cd test
13$ nix-shell
14nix-shell> ./run.sh
15```