Git隐藏流行二进制文件-合并冲突 [英] Git stash pop with binary - merge conflict

问题描述

我正在尝试对二进制文件执行"git stash pop".这会导致合并冲突.我只想提取存储中的内容并覆盖工作目录中的内容.最简单的方法是什么?

I'm trying to do a "git stash pop" with a binary file. It results in a merge conflict. I just want to pull what's in the stash off and overwrite what's in the working directory. What is the easiest way to do that?

推荐答案

要将所有文件还原到其隐藏版本:

To restore all files to their stashed version:

$ git checkout stash -- .

这篇关于Git隐藏流行二进制文件-合并冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！