git推送冲突

当本地修改了A文件，且add暂存commit成功。当向远程库推送时，发现远程库A文件已经被更新过。此时推送会报冲突。

此时先执行  git rebase --abort 命令将当前的commit会回到rebase操作之前的状态 。

然后再 git reset HEAD^ 撤回所提交的东西，自己修改的文件退回工作区副本。

然后先贮藏本地修改，先拉取远端文件，再还原贮藏，修改冲突。然后add  、commit 、pull

参考博客http://www.mamicode.com/info-detail-1812492.html

user@M7072XFZ MINGW64 /f/project/FrontProject/map-manage-front-dev (develop|REBASE 1/1)
$ git rebase --abort

user@M7072XFZ MINGW64 /f/project/FrontProject/map-manage-front-dev (develop)
$ git reset HEAD^
Unstaged changes after reset:
M       src/pages/App/AppClassify/components/Table/Table.vue
M       src/pages/orgMgt/DepAppMgt/components/OrganizerManagement/organizerManagement.vue
M       src/pages/virtualOrg/AppAuth/components/EimLeftRightList/leftRightList.vue

user@M7072XFZ MINGW64 /f/project/FrontProject/map-manage-front-dev (develop)
$ git pull --rebase
First, rewinding head to replay your work on top of it...
Fast-forwarded develop to ded8d0282cfe9d1cd02e4e2b69f272a4a92c21e5.

user@M7072XFZ MINGW64 /f/project/FrontProject/map-manage-front-dev (develop)
$