News for hackers. Stuff that matters.
Re:Using Git's rerere feature to escape recurring conflict hell by ubercore on Monday June 01, 2026 @09:43AM (#48356782)
I've never even seen someone suggest a rebase master onto feature workflow! TIL.
Re:Using Git's rerere feature to escape recurring conflict hell by dools on Monday June 01, 2026 @09:46AM (#48356817)
I think the terminology would be the other way around, like you're rebasing the feature onto the main:

git checkout feature

git rebase main

git checkout main

git merge feature

that way you get all your conflicts on the feature branch during rebase and your merge is always clean.

Re:Using Git's rerere feature to escape recurring conflict hell by barbazoo on Monday June 01, 2026 @10:49AM (#48357567)
> I get all my conflicts on branches because I rebase before merging

Pretty sure it's the other way around. You're on the branch and rebase it atop current master. If you merge after that, you won't have merge conflicts.