Created
February 28, 2014 17:06
-
-
Save jimallman/9275020 to your computer and use it in GitHub Desktop.
Mismatched branch + study
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ~/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