|
| 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 22:48:43 +0000 |
Alan,
I missed part of your message, if you've already fixed it in the file, just git add $FILE && git commit to resolve.
| [Prev in Thread] | Current Thread | [Next in Thread] |