message no. 45932
Posted by pagios in #github at 2014-09-06T09:00:04Z
Neptu: so mainly if i have index.html in my directory and i pull and in that pull i have an index.html updated by my developer, would my index.html be overwritten or git will merge my index.html with his index.html and create a new index.html containng both my code and his?