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


Yogesh Siraswar
 

Denys,
This patch was marked for both master and dunfell. The patch file name were different so missed on the changes. My bad. I guess, we need to back-port master patch to dunfell instead of creating new patch.

Thanks
Yogesh

On 7/14/2021 2:57 PM, Denys Dmytriyenko wrote:
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

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