Hi Julien, hi Mike,
thank you. So I will stop review until the author has adapt his patch.
Kind regards
Regina
julien2412 schrieb am 23-Feb-20 um 14:22:
Hi Regina,
I gave it a try and it seems the conflict is due to the patch
https://cgit.freedesktop.org/libreoffice/core/commit/?id=1f625b3f74
Hi Regina,
I gave it a try and it seems the conflict is due to the patch
https://cgit.freedesktop.org/libreoffice/core/commit/?id=1f625b3f74c6e6e5ef345a3e017061be918e443b
which has been merged.
Julien
--
Sent from:
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
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 t
Hi all,
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
Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.
