0

Yesterday, the developer I work with did some branch cloning to accomplish what he needed to accomplish, but when I did a git pull, the system pulled some items, and then I got a Fast-forward .gitignore on some of the files which seem to not have gotten added.

But when I did git pull origin master the system told me that the branch is already up to date.

Is there a way I can get the files that did not get pulled? And could someone please help me understand what is happening? Here is the message from the original pull:

remote: Counting objects: 33, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 20 (delta 13), reused 0 (delta 0)
Unpacking objects: 100% (20/20), done.
From https://bitbucket.org/genadinik/fundraising
   a49bd87..eef5124  master     -> origin/master
Updating a49bd87..eef5124
Fast-forward
 .gitignore                                            | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Crashlytics.framework/Versions/A/Crashlytics          | Bin 1893656 -> 1911576 bytes
 Crashlytics.framework/Versions/A/Resources/Info.plist |  20 ++----------
 Crashlytics.framework/run                             | Bin 448880 -> 372912 bytes
 Fundraising/AppDelegate.m                             |   5 +++
 Fundraising/Fundraising-Info.plist                    |   2 +-
 Fundraising/en.lproj/MainStoryboard_iPhone.storyboard | 144 +------------------------------------------------------------------------------------
 7 files changed, 149 insertions(+), 162 deletions(-)
 create mode 100644 .gitignore
4

1 回答 1

2

首先，请注意，如果您在 Linux 或 Mac 上，.gitignore 是一个隐藏文件。您可以使用 ls -a 来显示它。

然后，如果文件被意外擦除，您可以在存储库的根目录下使用以下命令：

git checkout HEAD .gitignore

以最新版本的方式恢复 .gitignore 文件。我不能再帮你了。

你应该把你写的东西读两遍，有些句子也没有意义。

于 2013-02-21T12:25:32.847 回答