Or 2 developers; it's still just as annoying. As long as you and the other developer are working at the same time you'll have almost as many merges.
Or 2 developers; it's still just as annoying. As long as you and the other developer are working at the same time you'll have almost as many merges.