Created
May 11, 2014 17:30
-
-
Save fabianogoes/9c7ececcbcdb60be0f0d to your computer and use it in GitHub Desktop.
git status após resolver conflito
This file contains 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
# HEAD detached from 6c3cfe3 | |
# You are currently rebasing branch 'pelican' on '6c3cfe3'. | |
# (all conflicts fixed: run "git rebase --continue") | |
# | |
nothing to commit, working directory clean |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment