当我尝试从git拉取时,出现以下错误
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
我尝试了储藏变更,但在执行“stash pull”后不起作用,要求合并。
如何在不提交/添加现有内容的情况下拉取变更?
-f
标志(你会丢失本地更改)。git stash
应该可行,你是如何使用它的? - Maroun