3

I'm having a rather annoying issue that is likely a simple problem to fix, though I cannot find any solution on google to it.

I'm currently working on an assignment that requires me to switch between branches that are "checkpoint" based work and "assignment" based. Basically what's happening is every time I push something to Github, the local files in the folder I'm working on seem to...disappear and I don't know why. I have to recreate the files and copy/paste code into it every time and it is driving me insane. Here is what I have been doing at the end of either completing a checkpoint or assignment;

git add .
git commit -m ""
git push origin "checkpoint name"
git checkout master

And after that's done, the files in my work folder are no longer in my local for some reason and I can't figure this out.

rink.attendant.6
  • 44,500
  • 61
  • 101
  • 156
mslee017
  • 41
  • 1
  • 3
  • 1
    most likely the changes you have are in a particular branch. Checkout the particular branch and you must see the changes again – Pradheep Jul 20 '15 at 05:26
  • Thank you- that seemed to work. I'm not sure if this was correct but I went into the most recently completed checkpoint, did a git push and the files from it were back on my PC – mslee017 Jul 20 '15 at 05:32
  • Dont do the last command (git checkout master). the problem is that there are multiple branches and unless you merge it to the master you wont see the changes in master. – Pradheep Jul 20 '15 at 05:36
  • accept the answer so that the question comes to a logical conclusion – Pradheep Jul 20 '15 at 14:18

2 Answers2

5

The problem is that the last command switches the branch to master and since the changes are not merged to master the changes are not visible in the master branch.

What is suggested is not to execute the last command git checkout master and continue working and once all the changes are done, then merge with master.

Look into the tutorial for more details https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

Pradheep
  • 3,553
  • 1
  • 27
  • 35
0

Decision for XCode users:

I faced the same problem: after synchronizing with GitHub all my new local files disappeared, though they were still present on GitHub. That drived me mad.

The problem was in xcodeproject/project.pbxproj file. It controls files presented in the project. More on it here: Should I git ignore xcodeproject/project.pbxproj file?

It turned out that it was in my .gitignore file!

To check this out, open Terminal and do: 

cd //go to your root directory
open .gitignore_global //first, look in your global .gitignore

If you have this file, it will be opened in your text editor. Look for the line 

*.pbxproj

and delete it! If you don't have .gitignore_global, then navigate in Terminal to your directory with Xcode project, and do: 

open .gitignore //this will open your local .gitignore for the project

And again, find *.pbxproj line and delete it.

I wish I had this answer earlier, so I decided to add it here.

joliejuly
  • 2,127
  • 1
  • 21
  • 24