If you don't touch the same files the merge is trivial. If you do - then it's a good thing that you see there's a conflict right away, rather than notice versi

If you don't touch the same files the merge is trivial. If you do - then it's a good thing that you see there's a conflict right away, rather than notice versioning problems between your separate subsystems in integration testing (or even worse - production).