Every story and comment from the Hacker News API, in a layout borrowed from 2001.
A comment on Using Git's rerere feature to escape recurring conflict hell. Parent comment
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.
There are no comments on this comment yet.
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.