On 2023-11-13 22:08, Stephen Rothwell wrote: > Hi Luben, > > BTW, cherry picking commits does not avoid conflicts - in fact it can > cause conflicts if there are further changes to the files affected by > the cherry picked commit in either the tree/branch the commit was > cheery picked from or the destination tree/branch (I have to deal with > these all the time when merging the drm trees in linux-next). Much > better is to cross merge the branches so that the patch only appears > once or have a shared branches that are merged by any other branch that > needs the changes. > > I understand that things are not done like this in the drm trees :-(
Hi Stephen, Thank you for the clarification--understood. I'll be more careful in the future. Thanks again! :-) -- Regards, Luben
OpenPGP_0x4C15479431A334AF.asc
Description: OpenPGP public key
OpenPGP_signature.asc
Description: OpenPGP digital signature
