646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
16 lines
541 B
Markdown
16 lines
541 B
Markdown
# 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
|
|
```
|