Error while cherry-picking


(CLIFF GITA) #1

Hello community, Been working on an issue that requires backporting commits through cherry-pick and everytime i do the cherry-picking am an error which fails the cherry picking of the commits as seen below Capture1 @samuel34 @tendomart @dkayiwa


(Nathan Ruhanga) #2

@gcliff , could this ( https://stackoverflow.com/questions/19830464/git-cherry-pick-and-conflicts) be helpful?


(tendo kiiza Martyn) #3

@gcliff was the link of help ?


(CLIFF GITA) #4

sorry for not responding early but i have been reading about it and its helping out


(CLIFF GITA) #5

sorry man for responding late, but the link is helpful and still reading here i detail to see what i can dig out