Git结帐分支但文件已更改

时间:2018-04-16 07:52:43

标签: git

我正在FFmpeg工作。我git克隆它的源代码。当我git status时,一切运作良好。

FFmpeg git:(master) git status
On branch master
Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean

但现在我想将分支更改为release/3.4,某些文件已被更改。

FFmpeg git:(master) git checkout release/3.4
Switched to branch 'release/3.4'
Your branch is up-to-date with 'origin/release/3.4'.
FFmpeg git:(release/3.4) ✗ git status
On branch release/3.4
Your branch is up-to-date with 'origin/release/3.4'.
Untracked files:
        (use "git add <file>..." to include in what will be committed)

libavcodec/codec_list.c
libavcodec/parser_list.c
libavdevice/indev_list.c
libavdevice/outdev_list.c
libavfilter/filter_list.c
libavformat/demuxer_list.c
libavformat/muxer_list.c

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

我很困惑。我从未更改过这些文件。

1 个答案:

答案 0 :(得分:2)

.gitignore中掌握这些文件are,但在release/3.4are not {{3}}。可能它们未在该版本中使用,或者发布分支中的.gitignore错误。通常,最好在切换分支之前清除构建工件,以防止VCS或后续构建出现意外行为。

相关问题