Re: [EXTERNAL] [meta-ti] Merge confict chunk


Denys Dmytriyenko
 

Yogesh,

You should not rebase master or release branches like dunfell.

It appears master already had a similar patch from March, which was never
merged to dunfell. So master now tries to patch it twice...

I'll send a cleanup for master shortly.

On Wed, Jul 14, 2021 at 01:21:11PM -0500, Yogesh Siraswar wrote:
Hi Raj,
Thanks for pointing it out. Have fixed the same. Will try to be
more careful in future.

Thanks
Yogesh

more
On 7/14/21 12:15 PM, Khem Raj wrote:
Hi Denys

This commit

https://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=4c1d26f6282b9959b9ee10aa77b3e05ed56299fb

has a merge anchor thats committed perhaps accidentally.

Thanks
-Khem
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964

Join meta-ti@lists.yoctoproject.org to automatically receive all group messages.