Re: Handling conflicts and cherry-pick to 2022Q3 issue

2022-07-28 Thread Nuno Teixeira
Fixed and committed, thanks Nuno Teixeira escreveu no dia quinta, 28/07/2022 à(s) 23:36: > yes it is > > Michael Gmelin escreveu no dia quinta, 28/07/2022 > à(s) 23:35: > >> Look at what you’re trying to commit and check if there are any conflict >> marker (>>>, <>, =).

Re: Handling conflicts and cherry-pick to 2022Q3 issue

2022-07-28 Thread Nuno Teixeira
yes it is Michael Gmelin escreveu no dia quinta, 28/07/2022 à(s) 23:35: > Look at what you’re trying to commit and check if there are any conflict > marker (>>>, <>, =). > > On 28. Jul 2022, at 23:44, Nuno Teixeira wrote: > >  > Hello, > > I'm trying to commit to 2022Q3

Re: Handling conflicts and cherry-pick to 2022Q3 issue

2022-07-28 Thread Michael Gmelin
Look at what you’re trying to commit and check if there are any conflict marker (>>>, <>, =). > On 28. Jul 2022, at 23:44, Nuno Teixeira wrote: > >  > Hello, > > I'm trying to commit to 2022Q3 PR 265530 and after solving Makefile conflicts > (PORTREVISIONs), git push