|
| From: | Dmitry Gutov |
| 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 04:02:48 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/27/2015 01:39 AM, Alan Mackenzie wrote:
I don't think I want to "unstage" anything (whatever that might mean) - IIUC, the suggested recipe would discard all my changes.
No, it won't. It will just remove them from the staging area.
| [Prev in Thread] | Current Thread | [Next in Thread] |