Hacker News Reader

Comment by mixmastamyk | Hacker News Reader

Yes, and these folks are never around when you try rebase and get a forty file conflict and have no idea how to get out. Happened to me several times when I fell for one of these articles.

You know what works almost every single time? With tiny conflicts if any? Merge + squash on gitlab.

View on HN

Yep. And most of the time conflicts merging from master into your working branches produces minimal conflicts.

Rebasing is just a way to make extra work for yourself

If a rebase goes wrong and you want out you can run,

  git rebase --abort

to return to where you were beforehand.

I find that git is actually very good at explaining what is going on and what you should do next by just running git status in the middle of some process like rebasing and reading what it says.

Even if it all goes really wrong the git reflog has always saved me.

Ok, but what do you do when it goes wrong every single time you've tried it? That's what happens at work, so I gave up and use merge+squash on gitlab.

Reply on news.ycombinator.com