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:	Tue, 26 May 2015 23:14:08 +0000

Alan,

also look at this...

http://stackoverflow.com/questions/936249/stop-tracking-and-ignore-changes-to-a-file-in-git

[Prev in Thread]

Current Thread

[Next in Thread]

After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Alan Mackenzie, 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?, 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?, Alan Mackenzie, 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?, 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 <=
    - Message not available
    - 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?, Tom Jakubowski, 2015/05/26
    - 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?, Andreas Schwab, 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/27
    - Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?, Yuri Khan, 2015/05/28
- 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?, Artur Malabarba, 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/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: 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: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
Index(es):
- Date
- Thread