文章标题

Commit your changes or stash them before you can merge”?

当你执行git pull的时候可能会遇到上面的问题。这种情况出现的原因，是由于你在本地有未提交的代码。相应的结局思路也有几种，可以先提交代码，再拉取合并，或者是忽略掉本地的改动。具体的方法见下面谷歌的答案。总之呢，牵涉到两个方面，一个是commit，这个没什么好说的了；或者也可以利用stash特性，这个回头再看看。

You can’t merge with local modifications. Git protects you from losing potentially important changes. You have three options.

• One is to commit the change using

git commit -m "My message"

• The second is to stash it. stashing acts as a stack, where you can push changes, and you pop them in reverse order.

  To stash type:
  git stash
  Do the merge, and than pull the stash:
  git stash pop

• The third options is to discard the local changes using git reset –hard.

One approach is to commit that file first then pull.
git add filename
git commit
//enter your commit message and save
git pull
Another approach is stash your changes then pull. Then apply stash.
git stash
git pull
git stash apply stash@{0}