Git merging and conflict-resolving Ranorex Repositories

Ranorex Spy, Recorder, and Studio.
krstcs
Ranorex Guru
Posts: 2683
Joined: Tue Feb 07, 2012 4:14 pm
Location: Austin, Texas, USA

Re: Git merging and conflict-resolving Ranorex Repositories

Post by krstcs » 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.
Shortcuts usually aren't...