Disable Git rename tracking
Some commits appear to confuse the hell out of Git, causing it to think there are conflicts when this is not the case. Disabling rename detection resolves this issue.
Edited by Marin Jankovski
Some commits appear to confuse the hell out of Git, causing it to think there are conflicts when this is not the case. Disabling rename detection resolves this issue.