terminal

gistfile1.txt

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")