Re: Conflict with submitted change

[Kaganski Mike <mikekaganski@xxxxxxxxxxx>]

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
_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice