git reset --merge与git reset --keep [英] git reset --merge vs git reset --keep

问题描述

我读过 文档， 但是我很难理解两者之间的区别

I have read the documentation, however I am having a hard time understanding the difference between

git reset --merge

和

git reset --keep

请提供简单的说明和/或示例.

Please provide a simple explaination and/or example.

推荐答案

在处理合并冲突时，它们是不同的，例如，这将产生冲突

They are different when dealing with a merge conflict, for example this will generate a conflict

git init
echo 333 > foo.txt
git add foo.txt
git commit -m 333
git checkout -b feature
echo 444 > foo.txt
git commit -am 444
git checkout master
echo 555 > foo.txt
git commit -am 555
git merge feature

然后

$ git reset --keep
fatal: Cannot do a keep reset in the middle of a merge.

$ cat foo.txt
<<<<<<< HEAD
555
=======
444
>>>>>>> feature

对

$ git reset --merge

$ cat foo.txt
555

这篇关于git reset --merge与git reset --keep的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！