Eh, I just pull, branch and push.

Merge after that... If that doesn't work I cherry-pick.

If that doesn't work I copy changes out of the folder, reset and copy back in.

Somehow I've gotten by for years fine.