/git-rebase-autocon.html

[sunaku]

Automatic merge conflict resolution for git-rebase(1)

https://sunaku.github.io/git-rebase-autocon.html

[sunaku]

Posted by Charles Celerier
Wednesday Oct 23, 2024 at 22:17 GMT

---

I serendipitously read this post a few days ago and then read https://blog.gitbutler.com/fearless-rebasing/ which covers a similar feature from Jujutsu ported to GitButler. You didn't mention either, so I figured I would mention them in case others notice the similarity.

[sunaku]

Posted by sunaku
Thursday Dec 05, 2024 at 19:28 GMT

---

Thanks for the update! Note that the script in this article was written in the year 2010: more than a decade before GitButler came into existence -- hence it wasn't mentioned.