[auscompgeek]

That somewhat sounds like the sort of thing git imerge does.