Merge pull request #14685 from eileenmcnaughton/mark_conflict
authorSeamus Lee <seamuslee001@gmail.com>
Tue, 2 Jul 2019 15:29:28 +0000 (11:29 -0400)
committerGitHub <noreply@github.com>
Tue, 2 Jul 2019 15:29:28 +0000 (11:29 -0400)
commit38f02a81d4b5e239f4f434d9bf42a7a2fa0a3f8f
treef7214c889d5a8e106d0adbce3b62ad9aa0f78627
parent1d52cf02cbf2bc654f7541732150758001cfea45
parentffa59d181fdfc9f5ebcbe0320bcf7ee03a08b208
Merge pull request #14685 from eileenmcnaughton/mark_conflict

Consolidate handling of conflicts between the batch job and get_conflicts api