|
From: | Stefan Monnier |
Subject: | Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? |
Date: | Tue, 26 May 2015 22:40:20 -0400 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> Which will have the exact same effects as `git rm --cached <file>' no? Not at all. "git rm ..." will remove the file from the repository, i.e. it will have an effect for *everyone else*. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |