News for hackers. Stuff that matters.

A comment on Using Git's rerere feature to escape recurring conflict hell. Parent comment

Re:Using Git's rerere feature to escape recurring conflict hell by alexsmirnov on Monday June 01, 2026 @01:39PM (#48360080)
We usually squash feature branches before merge. To squash before rebase, I use git reset --soft $(git merge-base develop HEAD) && git commit && git rebase develop - you have to resolve final conflicts only
[ Parent | on HN ]

There are no comments on this comment yet.