Once the branches diverge, git cherry-pick is the better merge process. On Tue, Jan 4, 2022 at 11:06 AM Robert Middleton <[email protected]> wrote:
> Just as a note to all, what I've been doing with next_stable is to > periodically merge master back in once I make fixes on master(assuming > that those fixes are common to both). Unfortunately with the > multithreaded speed fix this has resulted in a moderately sized merge > conflict. I think I've fixed everything to work properly at this > point. > > What should our workflow be? Is there a better way? Obviously there > are certain things that would only target next_stable and not master, > so I'm not thinking about those cases for this. > > -Robert Middleton >
