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:	Andreas Schwab
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 10:17:10 +0200
User-agent:	Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

Alan Mackenzie <address@hidden> writes:

> It is my own personal copy of .gitignore

Don't.  Use .git/info/exclude.

Andreas.

-- 
Andreas Schwab, SUSE Labs, address@hidden
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

[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, 2015/05/26
    - 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 <=
    - 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
    - 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?, 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: 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