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:	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]

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 <=
    - 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?, 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

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