Get the latest tech news
GitButler now supports first class conflicts, making rebasing less annoying
GitButler now supports first class conflicts, which makes rebasing much less annoying. What is "fearless rebasing"?
Rebasing versus merging, which is better?I've always loved the idea of a linear history, of rewriting a series until it's perfect and getting that nice useful blame and bisecting power. Getting rid of that subway map history graph in favor of a nice simple series of patches. If Git runs into a conflict when trying to merge, rebase or cherry-pick something, it halts everything and makes you fix it before moving forward.
Or read this on Hacker News