Login
From:
Felix Rieseberg
(Uncensored)
subscribe
Avoid Git Merge Conflicts During a Big Rebase
https://felixrieseberg.com/better-rebasing/
links
backlinks
Tagged with:
git
github
You need to rebase a feature branch you worked on weeks ago. Merge conflicts everywhere. But: There's hope. Use "git merge --squash".
Roast topics
Find topics
Find it!
