Re: Conflict with submitted change

Kaganski Mike <mikekaganski -AT- hotmail.com>

Sat, 2 Feb 2019 13:26:24 +0000

Hi, On 02.02.2019 9:48, Aditya Sahu wrote:

Hi,
I submitted a change ( Change-Id: 
I440c637dd2a566f820a6e8fac826f35cabb9c05f ) but after doing that, I 
found out that it is having conflict with some other change ( Change-Id: 
I937ed12f2a96943664087ddcdd035f1347e84a57 ).
What should be my move here?

As discussed on IRC, that was a misunderstanding: gerrit shown "Conflict with:" information about a change modifying the same file (in a different place: [1], [2]). The changes don't actually conflict. [1] https://gerrit.libreoffice.org/#/c/67102/2/svtools/source/dialogs/PlaceEditDialog.cxx [2] https://gerrit.libreoffice.org/#/c/66055/11/svtools/source/dialogs/PlaceEditDialog.cxx -- Best regards, Mike Kaganski

Context

Conflict with submitted change · Aditya Sahu

Re: Conflict with submitted change · Kaganski Mike

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.