repo-updater: Test picking when resolving repo conflicts
Created by: keegancsmith
The current implementation was not tested deterministically since which branch we took depended on the order we iterated byID. This refactor makes it deterministic and I believe improves readability.
Discussion: https://sourcegraph.slack.com/archives/C07KZF47K/p1559818667051900