pyrox.dev
1# Auto rebase script
2
3The [`./run.sh` script](./run.sh) in this directory rebases the current branch onto a target branch,
4while automatically resolving merge conflicts caused by marked commits in [`.git-blame-ignore-revs`](../../../.git-blame-ignore-revs).
5See the header comment of that file to understand how to mark commits.
6
7This is convenient for resolving merge conflicts for pull requests after e.g. treewide reformats.
8
9## Testing
10
11To run the tests in the [test directory](./test):
12```
13$ cd test
14$ nix-shell
15nix-shell> ./run.sh
16```