从版本库中删除本地更改

编辑为简洁：

$ git pull origin master 
* branch   master  -> FETCH_HEAD 

error: The following untracked working tree files would be overwritten by merge: 
    app/models/page.rb 
Please move or remove them before you can merge. 
Aborting 
$ git reset --hard 
HEAD is now at d90309f 
$ git pull origin master 
* branch   master  -> FETCH_HEAD 

error: The following untracked working tree files would be overwritten by merge: 
    app/models/page.rb 
Please move or remove them before you can merge. 
Aborting 

$ git rm --cached 
usage: git rm [options] [--] <file>... 

    -n, --dry-run   dry run 
    -q, --quiet   do not list removed files 
    --cached    only remove from the index 
    -f, --force   override the up-to-date check 
    -r     allow recursive removal 
    --ignore-unmatch  exit with a zero status even if nothing matched 

$ git pull origin master 
From https://github.com/Jinxy5/laughing-octo-lana 
* branch   master  -> FETCH_HEAD 
error: The following untracked working tree files would be overwritten by merge: 
    app/models/page.rb 
Please move or remove them before you can merge. 
Aborting 
$ git rm --cached app/models/page.rb 
fatal: pathspec 'app/models/page.rb' did not match any files

答案类似的问题状态git rm --cached来解决这些问题，但我做错了？因为它说它不匹配任何文件？也许是因为我运行git reset？

来源

2014-05-20 Starkers

我是否用'u'替换了一个提交ID？我做到了这一点，它没有做任何事情。 – Starkers

这个什么：我想出了

git clean -fd

来源

2014-05-20 10:57:16

这样做:)谢谢 – Starkers

很高兴帮助！可能你可以接受这个答案呢？ –

你必须看看这个帖子最近对消除局部变化

Various ways to remove local Git changes

“结论很清楚的知道：

很明显，我们可以使用

（1）的组合git clean -f和git reset --hard OR

（2）git stash -u 以实现期望的结果。

git clean -f -d "

来源

2014-07-29 17:57:46

从版本库中删除本地更改

回答

相关问题