Rebase PR with multiple conflicts over time

[abitrolly]

• I want to read package changes prior to installing dnf updates
  • I created dnf-go-gui app for that and now I need to create public repo for it
    • I tired of setting up repo manually and I need to automate the process using Terraform
      • Terraform GitHub provider doesn't support personal repositories
        • The PR that adds the support needs to be rebased

---

The rebasing is non-trivial and needs one of the tools for incremental rebases.

• https://github.com/mhagger/git-imerge
• https://github.com/0k/git-irebase
• https://github.com/mkchoi212/fac

[abitrolly]

Trying git-imerge.

$ ./_bin/git-imerge/git-imerge rebase upstream/master

[abitrolly]

The rebase was done in integrations/terraform-provider-github#322 - definitely using fac and git-imerge. But the new PR now needs a rebase too.

[abitrolly]

Another big piece of work that needs a rebase RHVoice/RHVoice#21

[abitrolly]

Instruction. Start rebase of current branch on top of upstream/master and save it into result branch.

$ python3 ~/bin/gitimerge.py start --name result --goal rebase upstream/master