Sounds like you should commit more often inside you topic branches. In case you are talking about merge conflicts: That's the nature of distributed development

Sounds like you should commit more often inside you topic branches. In case you are talking about merge conflicts: That's the nature of distributed development other people might trump on places you are currently working on. I guess there are more intelligent merge strategies. But GIT gives you a list of files that need a manual merge and you have to look into them one by one. GIT even tells you what to do in this case.