conflicts: Modernize the tests in `resolve_conflicts_test`

The tests in resolve_conflicts_test.go are old. The use seeded repositories and hard-coded SHA1s.

Let's modernize these tests with non-seeded repos and make them hash function agnostic. This also makes it easier to add new tests in the future.

Closes #4580 (closed)