Not realizing that git branches are cheap. 1. Create a branch from the intended destination. 2. Merge/rebase/whatever complex operation you need to do into th

Not realizing that git branches are cheap. 1. Create a branch from the intended destination. 2. Merge/rebase/whatever complex operation you need to do into that branch. 3. If successful merge this branch (fast forward merge) into the intended destination. 4. If unsuccessful delete the branch and start over at step 1.