repo-updater: Deterministic merge and prevent name conflicts from sources

Created by: keegancsmith

See individual commits. Will write more tests. But the tests added I believe ensure we won't run into this.

Fixes https://github.com/sourcegraph/sourcegraph/issues/4210