blob: e9c61da05c93eb5f8e42aa655d47cc4f4b12b9fe (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
# Auto rebase script
The [`./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).
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](./test):
```
$ cd test
$ nix-shell
nix-shell> ./run.sh
```
|
