GitLab

This patch addresses the problem of conflict in bookmarks upon
receiving a remote update for a node that has local changes.

The general polic that is implemented is that server wins except in
case of deletion.

Bug: 516866
Change-Id: I50a85bde068dd9414e4e22bc1a33529fb3dfffa1
Reviewed-on: https://chromium-review.googlesource.com/1157006
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580436}