Re: Git merging and conflict-resolving Ranorex Repositories
Posted: Thu Mar 22, 2018 6:00 pm
Ah, I get it now. Yeah, normally git knows better about how to merge *.cs files than XML, so they will usually merge better then XML. Code files seem to be easier in all merge environments, not just git.
But, really, whatever works for you is usually best.
But, really, whatever works for you is usually best.