|
| 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:38:51 +0300 |
> Date: Tue, 26 May 2015 22:56:41 +0000 > From: Alan Mackenzie <address@hidden> > Cc: address@hidden, Dmitry Gutov <address@hidden> > > How do I tell git the conflict has been fixed - not as a part of doing > something else (which must not be done), but as a primitive operation? > This surely must be possible in such a sophisticated SCM tool. Either "git add FILE" or "git reset FILE". In your case, the latter, because you don't want to commit your local changes yet.
| [Prev in Thread] | Current Thread | [Next in Thread] |