Git合并错误我想不出来

时间:2014-10-22 18:45:53

标签: git git-stash

我对Git很新,遇到了一个我不理解但在搜索中找不到的问题。我试图藏匿两个需要删除的文件,但我不能和我一直收到错误。最新错误如下。

docroot/sites/all/libraries/wurfl/resources/storage/persistence/1/9/94e44b4e8fd47b34c1646f46907e0e: needs merge
docroot/sites/all/libraries/wurfl/resources/storage/persistence/1/9/94e44b4e8fd47b34c1646f46907e0e: needs merge
docroot/sites/all/libraries/wurfl/resources/storage/persistence/1/9/94e44b4e8fd47b34c1646f46907e0e: unmerged (6f6312822c4d0d0b8ec02807d79da076e3c0db5d)
docroot/sites/all/libraries/wurfl/resources/storage/persistence/1/9/94e44b4e8fd47b34c1646f46907e0e: unmerged (2ae4144909e1c3dce145acc19510a15ac3e09ece)
fatal: git-write-tree: error building trees
Cannot save the current index state

我怎样才能藏匿这些因为我不需要它们?任何帮助都是极好的!!! 感谢

0 个答案:

没有答案