I personally never rebase. It always seems to have some problem. I'm surely there's a place and time for rebasing but I've never seen it in action I guess.

[–] dukk@programming.dev 17 points 1 year ago* (last edited 1 year ago) (4 children)

Merge commits suck.

My biggest issue with GitHub is that it always squashes and merges. It’s really annoying as it not only takes away from commit history, but it also puts the fork out of sync with the main branch, and I’ll often realize this after having implemented another features, forcing me end up cherry picking just to fix it. Luckily LazyGit makes this process pretty painless, but still.

Seriously people, use FF-merge where you can.

Then again, if my feature branch has simply gone behind upstream, I usually pull and rebase. If you’ve got good commits, it’s a really simple process and saves me a lot of future headaches.

There’s obviously places not to use rebase(like when multiple people are working on a branch), but I consider it good practice to always rebase before merge. This way, we can always just FF-merge and avoid screwing with the Git history. We do this at my company and honestly, as long as you follow good practices, it should never really get too out of hand.

[–] GandarfDeGrape@midwest.social 3 points 1 year ago

Sounds like I just gotta get better with rebasing. But generally I do my merges clean from local changes. I'll commit and push, then merge in, push. Then keep working. Not too hard to track but I've found it's the diff at MR time that people really pay attention to. So individual commits haven't been too crucial.

load more comments (3 replies)

load more comments (24 replies)