git 提交解决冲突
一:git命令在提交代码前,没有pull拉最新的代码,因此再次提交出现了冲突。error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
http://www.cnblogs.com/qinbb/p/data:image/png;base64,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
解决方法如下两种:
1.保留你本地的修改
git merge --abort
git reset --merge
合并后记得一定要提交这个本地的合并(add-->commit-->push-->pull)
然后在获取线上仓库
git pull
2.down下线上代码版本,抛弃本地的修改
不建议这样做,但是如果你本地修改不大,或者自己有一份备份留存,可以直接用线上最新版本覆盖到本地
git fetch --all
git reset --hard origin/master
git fetch
二:从git远程仓库中pull最新的代码,出现如下错误:Please commit your changes or stash them before you merge.
http://www.cnblogs.com/qinbb/p/data:image/png;base64,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
4:这时候需要手动修改合并所需的代码即可。
5:git stash clear//需要清空git栈执行该命令
git stash: 备份当前的工作区的内容,从最近的一次提交中读取相关内容,让工作区保证和上次提交的内容一致。同时,将当前的工作区内容保存到Git栈中。
git stash pop: 从Git栈中读取最近一次保存的内容,恢复工作区的相关内容。由于可能存在多个Stash的内容,所以用栈来管理,pop会从最近的一个stash中读取内容并恢复。
git stash list: 显示Git栈内的所有备份,可以利用这个列表来决定从那个地方恢复。
git stash clear: 清空Git栈。此时使用gitg等图形化工具会发现,原来stash的哪些节点都消失了
三:git push 报错,如下:
https://images2015.cnblogs.com/blog/977380/201611/977380-20161104162740049-75220422.jpg解决命令:git pull --rebase origin 你的分支名称,如下图所示https://images2015.cnblogs.com/blog/977380/201611/977380-20161104162947893-1186549355.jpg
再次执行push命令:如下图所示:
https://images2015.cnblogs.com/blog/977380/201611/977380-20161104163038674-477857207.jpg
四:git push 还会报下面的错(如图所示):这多是多人开发有了冲突。
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
https://images2015.cnblogs.com/blog/977380/201612/977380-20161207154524476-9994719.png
解决命令如下:
git push -u 代码所在的分支 -f//强制提交,此时远程上的修改已经被覆盖。这种方法一般不建议使用,除非你把远程上修改的代码复制到本地。
五:本地回退历史版本,当提交代码发生冲突或者想回退到某一个版本,操作如下:
1:git log (获取提交的历史日志)
https://images2015.cnblogs.com/blog/977380/201612/977380-20161212095158745-1841932723.png
2: 执行命令:git reset--hard版本号(就是git log 中的commit后面的哈希值(上图中的黄色部分 commit 后面的值))
3:想要修改远程上的代码还需要执行如下命令:
git push -u 代码所在的分支 -f//强制提交,此时远程上的修改已经被覆盖。这种方法一般不建议使用,除非你把远程上修改的代码复制到本地。
页:
[1]