Skip to content

Instantly share code, notes, and snippets.

@cowlibob
Created April 8, 2012 22:43
Show Gist options
  • Save cowlibob/2340191 to your computer and use it in GitHub Desktop.
Save cowlibob/2340191 to your computer and use it in GitHub Desktop.
Git push origin works, where GitHub.app sync fails
James-Cowlishaws-MacBook:When-Boats-Met james$ git status
# Not currently on any branch.
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Gemfile
# deleted by us: app/controllers/events_controller.rb
#
no changes added to commit (use "git add" and/or "git commit -a")
James-Cowlishaws-MacBook:When-Boats-Met james$ git status
# Not currently on any branch.
nothing to commit (working directory clean)
James-Cowlishaws-MacBook:When-Boats-Met james$ git status
# On branch prototype
# Your branch and 'origin/master' have diverged,
# and have 44 and 6 different commit(s) each, respectively.
#
nothing to commit (working directory clean)
James-Cowlishaws-MacBook:When-Boats-Met james$ git push origin
Counting objects: 61, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (42/42), done.
Writing objects: 100% (43/43), 72.01 KiB, done.
Total 43 (delta 23), reused 0 (delta 0)
To git@github.com:cowlibob/When-Boats-Met.git
00a20eb..a3c2b80 prototype -> prototype
James-Cowlishaws-MacBook:When-Boats-Met james$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment