Git for Dumb Patchers

I think you are speaking about merging patches that have been changed by several people at the same time. This issue is addressed by this tool: