如果远程更新,撤消本地合并

我有以下几点 git 工作流程:

# finish locally committing to feature/new_thing
git push origin feature/new_thing
git checkout develop
git pull # Just in case I get a warning
git merge feature/new_thing
git push origin develop

这在99%的情况下有效,但在另外1%的情况下,这种情况会发生:

#Me                             #Other dev
git push origin feature/new_thing
                                git merge feature/other_new_thing
git checkout develop
                                git checkout develop
git pull
                                git pull
git merge feature/new_thing
                                git merge feature/other_new_thing
                                git push origin develop
git push origin develop

push 可预见的失败有:

error: failed to push some refs to 'git@server.git'

git reset HEAD~ 删除我的分支,然后 git pull 希望再次合并。我通常最后 reset 婷婷回到枝头前,重新站起来- pull 取消我的登机手续

必须有一个简单的方法来做到这一点!我试过用 git-workflow 有一段时间,但它经常卡住,需要更多的人工干预。