Skip to content

Instantly share code, notes, and snippets.

@fabianogoes
Created May 11, 2014 17:30
Show Gist options
  • Save fabianogoes/9c7ececcbcdb60be0f0d to your computer and use it in GitHub Desktop.
Save fabianogoes/9c7ececcbcdb60be0f0d to your computer and use it in GitHub Desktop.
git status após resolver conflito
# 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