subject:"Conflict with submitted change"

Re: Conflict with submitted change

2019-02-02 Thread Kaganski Mike

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 m

Conflict with submitted change

2019-02-02 Thread Aditya Sahu

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? -- Best Regards, Aditya Sahu _