News for hackers. Stuff that matters.
Re:Git: Using Advanced Rebase Features for a Clean Repository by nothrabannosir on Wednesday August 09, 2017 @07:37AM (#14967544)
Resolving conflicts through a merge or a rebase is a different style (all-in-one vs piece-meal), and I find both have their uses in different contexts. Sometimes, a big merge with tons of conflicts is too daunting, where a patch-by-patch conflict resolution is more palatable. Other times, you're doing busy work on tons of patches which would be far more efficient just doing once on a big merge.

But, again, this depends on the situation, the code, the history, the patches, etc. It's just a useful tool to keep in mind come merge time.

Re:Git: Using Advanced Rebase Features for a Clean Repository by branja on Wednesday August 09, 2017 @08:05AM (#14967717)
You can do both. Squash your working branch to a single commit, then rebase. That way you still get a clean view of just the changes introduced in the branch, and don't have to resolve merge conflicts every step of the rebase.