3 ms·
Right, a merge tool that understands Python semantics at some level should be able to detect when a block's indentation has changed, and adjust the indentation
by dooglius 8y ago
Right, a merge tool that understands Python semantics at some level should be able to detect when a block's indentation has changed, and adjust the indentation of any changes to that block correspondingly.