Comment by sa1

There’s also gitbutler for this kind of workflow, a bit more visual.