News for hackers. Stuff that matters.
Re:Extremely Linear Git History by masklinn on Tuesday November 22, 2022 @10:55AM (#33707094)
> Or is your workflow a combination of rebases and merges? Continual rebasing of the feature branch onto `main` and then a final merge commit when it's ready to go?

Yes. You don't usually need "continual" rebasing, most commonly just once just before merging.

In fact a good merge tool can do it for you (and refuse to merge if there are conflicts when rebasing).

There are no comments on this comment yet.