News for hackers. Stuff that matters.

A comment on Splitting a Git Commit. Parent comment

Re:Splitting a Git Commit by farlight on Tuesday August 18, 2026 @11:53AM (#49347601)
git rerere will resolve repeated conflicts for you automatically, you just need to enable it.

https://git-scm.com/docs/git-rerere

[ Parent | on HN ]
Re:Splitting a Git Commit by WorldMaker on Tuesday August 18, 2026 @02:42PM (#49350550)
Be careful, it will also cache any mistakes in merging including things like bug regressions. Especially if you also have a git history full of cherry-picking and reverts.
[ Parent | on HN ]