Merge Conflict on Gerrit
mikekaganski at hotmail.com
Sat Feb 22 19:39:45 UTC 2020
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
One needs to rebase and manually fix the conflicts; this needs to be
done locally, not through Web UI.
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 1769 bytes
Desc: not available
More information about the LibreOffice