Skip to content

Instantly share code, notes, and snippets.

@meyerson

meyerson/gist:4716716

Created February 5, 2013 18:57
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save meyerson/4716716 to your computer and use it in GitHub Desktop.
Save meyerson/4716716 to your computer and use it in GitHub Desktop.
Download ZIP
can't figure out why a remote I can't push to, decided to delete locally added content when merging
Raw
gistfile1.txt
After
git fetch origin
and
git merge --no-commit
I can examine the changes the remote would push
git diff --cached directory/filename.py
I see many lines with a (-), removing code I added to filename.py
SO, how the f*ck does a repository that I can't push to decides to delete code that was never pushed to it?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment