3 ms·
Why would developer style cause merge conflicts? We did just fine, thanks.
by oelmekki 9y ago
Why would developer style cause merge conflicts? We did just fine, thanks.
- tokenizerrr 9y agoWhen two people touch the same file and format it differently you get a merge conflict. Even if the actual code is identical. The only way I can imagine how you never ran into this is that either your team is tiny, or that people don't touch other people's code. Both of which are not an option as you grow.