On Tue, May 26, 2015, 6:39 PM Alan Mackenzie <acm@muc.de> wrote:

    On branch master
    Your branch is up-to-date with 'origin/master'.
    Unmerged paths:
      (use "git reset HEAD <file>..." to unstage)
      (use "git add <file>..." to mark resolution)

            both modified:   .gitignore

I don't think I want to "unstage" anything ...
Yes you do, unless you want the future changes to this file tracked by git in future