[Python-Dev] Re: Help to Resolve issues with Pull request 25220

2021-04-08 Thread Tony Flury via Python-Dev
Terry, Barney, I think I have done it right now - I have no idea what went wrong last time. I fixed it by recreating the changes from scratch, and scrupulously checking for the differences. Thanks for your help - although ultimately I didn't try to rebase. -- On 08/04/2021 01:32, Terry Ree

[Python-Dev] Re: Help to Resolve issues with Pull request 25220

2021-04-07 Thread Terry Reedy
On 4/7/2021 12:32 PM, Barney Gale wrote: It looks like you’ve incorporated several other changes into your commit by mistake. The PR definitely has too many changes unrelated to the issue. I recognize a few of the changes as related to recent merges. My guess that the the issue-43737 branch

[Python-Dev] Re: Help to Resolve issues with Pull request 25220

2021-04-07 Thread Barney Gale
Hi Anthony, It looks like you’ve incorporated several other changes into your commit by mistake. The simplest thing to do might be to re-create your git branch and PR from scratch. If conflicting changes land while your PR is still open, you’ll need to do something called a “rebase”. The git book