Git - save pending merge changes and check out another branch

Question

I am working on a git branch that has a lot of merge conflicts with another branch that I merged into. I started to fix conflicts, but I want to save my work and switch to another branch before finishing the merge process.

Is it possible to hide changes in the process of an incomplete merge to switch to another branch, and then switch back and complete the merge?

I spent a lot of time fixing conflicts, and I don't want to do this work again. What is the best way to continue?

I am using git version 1.7.10

Answer 1

Since merging is a process, you cannot push “changes” in the middle of a process.

It is best to clone the repo into another directory.

PS. Ben is always right.