Merge Conflict on Gerrit

[Mike Kaganski]

On 2020-02-22 22:05, Regina Henschel wrote:
> where can I see in the new UI to which patch there is a merge conflict.
> Example: Merge Conflict of https://gerrit.libreoffice.org/c/core/+/89125/3

A merge conflict means that this patch cannot be merged to current
master, not to some patch. Usually that means that a specific place
which this change modifies was changed independently, and so the diff
cannot be applied.

IIUC, in older UI, it was also impossible to see a patch which made this
change conflicting.

One needs to rebase and manually fix the conflicts; this needs to be
done locally, not through Web UI.

-- 
Best regards,
Mike Kaganski
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pEpkey.asc
Type: application/pgp-keys
Size: 1769 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/libreoffice/attachments/20200222/ecf0492d/attachment.key>