|
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 23:14:08 +0000 |
Alan,
also look at this...
http://stackoverflow.com/questions/936249/stop-tracking-and-ignore-changes-to-a-file-in-git
[Prev in Thread] | Current Thread | [Next in Thread] |