Skip to content

Instantly share code, notes, and snippets.

@cheezedigital
Created February 4, 2015 16:54
Show Gist options
  • Save cheezedigital/d0c27c0b6721d6968650 to your computer and use it in GitHub Desktop.
Save cheezedigital/d0c27c0b6721d6968650 to your computer and use it in GitHub Desktop.
terminal
cls(practice)$ git status
On branch practice
You are currently cherry-picking commit 6e0580a.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/views/account/dashboard/index.html.haml
no changes added to commit (use "git add" and/or "git commit -a")
****but in the example, it doesn't read both modified: <file> like this fuck up
reads
****# On branch branch-d
You have unmerged paths.
(fix conflicts and run "git commit")
Unmerged paths:
(use "git add/rm ..." as appropriate to mark resolution)
deleted by us: README.md
no changes added to commit (use "git add" and/or "git commit -a")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment