|
| 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 13:12:53 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/27/2015 06:14 AM, Kelvin White wrote:
In this case, this is exactly what you would want. Why would you want to keep this file in version control for everyone else?
Because the contents of .gitignore are valuable, and we don't want everyone to bother with recreating it.
| [Prev in Thread] | Current Thread | [Next in Thread] |