(use "git add/rm <file>..." as appropriate to mark resolution)
I would just delete my comment, but that would leave your replies looking dumb. Instead, feel free to downvote my earlier "Nope." into oblivion.