How to do a non-fast-forward git merge to a branch that isn't checked out?

Question

I\'m on branch a. I want to merge branch b into branch c. The merge is not a fast-forward, but it also doesn\'t require manual resolut

Answer 1

You can write a script even if your working directory is dirty. You will have to stash your changes first.

git stash
git checkout c
git merge b
git checkout a
git stash pop