Re: After a git merge and manual correction of a conflict, how do I tell

emacs-devel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: After a git merge and manual correction of a conflict, how do I tell

From:	Kelvin White
Subject:	Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
Date:	Wed, 27 May 2015 02:55:18 +0000

On Tue, May 26, 2015 at 10:40 PM Stefan Monnier <address@hidden> wrote:

> 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

Forgive me, but I think the confusion here is due to the fact that `git reset <file>' will remove it from the curennt index, while `git rm --cache <file>' will remove it from the repository completely, while leaving the current local copy in tact.

[Prev in Thread]

Current Thread

[Next in Thread]

Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, (continued)
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/26
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Dmitry Gutov, 2015/05/26
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Stefan Monnier, 2015/05/26
  - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/26
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Stefan Monnier, 2015/05/26
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White <=
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/26
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/26
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Dmitry Gutov, 2015/05/27
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/27
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Dmitry Gutov, 2015/05/27
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Kelvin White, 2015/05/27
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Dmitry Gutov, 2015/05/27
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Steinar Bang, 2015/05/28
- Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Eli Zaretskii, 2015/05/26
  - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Alan Mackenzie, 2015/05/27

Prev by Date: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
Next by Date: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
Previous by thread: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
Next by thread: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
Index(es):
- Date
- Thread