4 ms·
Right now source control applications don’t even detect simple merge conflicts based on meaning. For example if I remove a global variable from a source file a
by rileymat2 8y ago
Right now source control applications don’t even detect simple merge conflicts based on meaning.
For example if I remove a global variable from a source file and another branch adds another reference to it, if it does not occur on the same line git will happily merge the file with no conflict.