Git 解决未知文件被修改的莫名问题

当我们pull完代码时进行修改，修改后提交代码时会发现一些文件并未修改，但显示有差异，而且通过git status查看时是Untracked file如下：

$ git status
On branch master
Your branch is behind 'origin/master' by 27 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        model/src/main/java/

nothing added to commit but untracked files present (use "git add" to track)

 

如果忽略这些问题有时代码可以正常的pull和commit，但有时会导致我们pull代码失败，并提示：

error: The following untracked working tree files would be overwritten by merge

出错的文件正是那些不是我们修改的文件，这时候可以用如下方式进行处理：

1、git fetch origin master

把远端的代码拉倒本地，并把指针放到FETCH_HEAD中

$ git fetch origin master
connected to center BJ
From ssh:****
 * branch            master     -> FETCH_HEAD
Warning: cannot log into influxdb

2、git reset --hard FETCH_HEAD

把本地的代码指针切换到刚刚拉下来的那个指针上；

 

3、git push origin master

把本地的代码推送到远端，其实即使不推送也没问题，因为本地代码跟远端已经一致了；

$ git push origin master
connected to center BJ
Warning: cannot log into influxdb
Everything up-to-date

 

4、git status

再次查看发现那些文件的差异已经没有了

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

nothing to commit, working directory clean

5、后面可以继续执行其他操作了