temporary commit on complex merge
问题 I have two branches master which is the main branch and feature_branch_1 which is very old and many commits behind the master. I need to merge feature_branch_1 into master, so I did: git pull --rebase origin master As expected there are tons of conflicts, soon after there was a need to develop another feature on a new feature_branch_2 and this is against the HEAD of master and definitely needs to be worked on before feature_branch_1 . Being more or less in the middle of the complex merge, how