Auto Rebase Script for Conflict Resolution

maintainers/scripts/auto-rebase/README.md

06e13aa409fbb26859f2690de8765c3ceabab1fb1566eb9c000000030000021d

# 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
```

Chunks

fc35c2a7 (1st chunk of `maintainers/scripts/auto-rebase/README.md`)

Title: Auto Rebase Script for Conflict Resolution

Summary

This document describes an auto rebase script (`./run.sh`) that rebases the current branch onto a target branch. It automatically resolves merge conflicts, particularly those caused by commits marked in `.git-blame-ignore-revs`, which is useful for situations like treewide reformats. Instructions for running tests using `nix-shell` are also provided.