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:	Eli Zaretskii
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 05:37:15 +0300

> Date: Tue, 26 May 2015 22:39:28 +0000
> From: Alan Mackenzie <address@hidden>
> 
> Where is this 'bzr resolve' equivalent documented?

In your situation, the equivalent is "git reset .gitignore".

[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?, Eli Zaretskii <=
  - 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
- 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

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