2 ms·

> I do agree that resolving conflicts in merges is risky though. How do you do otherwise, though? Or is your workflow a combination of rebases and merges? Cont

• neweroldguy 4y ago
  This is what I do unless I’m working with a large number of people on the feature branch (which is rare, usually that would be multiple branches). You get the equivalent of “mergeless” history (just restrict your git log to merge commits) but can dig into the individual feature histories easily.
• masklinn 4y ago
  > 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).