3 ms·
I will go as far as to say that if you are repeatedly solving merge conflicts with new code you need to seriously revisit your version control choices. Merge co
by omegalulw 5y ago
I will go as far as to say that if you are repeatedly solving merge conflicts with new code you need to seriously revisit your version control choices. Merge conflicts are a tool to help you collaborate, they should not be an impediment.