Small team working on fairly big systems - we rarely have any merge conflicts due to the way we divide work up. They can be a pain in the arse when something h

Small team working on fairly big systems - we rarely have any merge conflicts due to the way we divide work up. They can be a pain in the arse when something has gone wrong though - but it's not really something we spend a lot of time worrying about. If it happens we just deal with it.