GitLab

From processor perspective, we always choose remote update in case of
conflict. This should work, because bridge aware of not-commited local
changes. Pending local commits reapplied on top of incoming changes
after processing conflicting remote update as regular update.

Bug: 922900
Change-Id: I7673822b4c8b4bd21965d5b2401c9dd3d62f0e6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865333
Commit-Queue: Maksim Moskvitin <mmoskvitin@google.com>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706938}