4 ms·
Rebase is easy and not terrifying. Here's a 1k word article on how to do it correctly. Or just do a merge and move on with your life.
by jimbobimbo 9mo ago
Rebase is easy and not terrifying. Here's a 1k word article on how to do it correctly.
Or just do a merge and move on with your life.
- bheadmaster 9mo agoIf you want to have a linear history on main, either always rebase your branch onto main, or merge but only accept squashed commits onto main.
- WolfeReader 9mo agoI would prefer to have accurate history over linear "history".
- bheadmaster 9mo agoGood luck bisecting.
- WolfeReader 9mo agoWith --first-parent, I don't need good luck in my bisecting.
- mathisfun123 9mo ago> Here's a 1k word article lol if 1k words is "not easy" for you, i think you have bigger problems than merge vs rebase.
- darknavi 9mo agoIt's funny because I learned git on the job and we exclusively used rebase when I was learning my git fundamentals. I wouldn't say merging scares be, but it's never a tool a reach for.