Skip to content

Instantly share code, notes, and snippets.

@jimallman
Created February 28, 2014 17:06
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 jimallman/9275020 to your computer and use it in GitHub Desktop.
Save jimallman/9275020 to your computer and use it in GitHub Desktop.
Mismatched branch + study
~/repo/phylesystem_test$ git status
# On branch jimallman_study_10
# Changes to be committed:
#
# modified: study/9/9.json
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: study/10/10.json
#
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment