@Oscar the test is still failing with the same error On Wed, Aug 25, 2021 at 3:03 PM Oscar Benjamin <[email protected]> wrote:
> On Wed, 25 Aug 2021 at 09:43, prathamesh bhole < > [email protected]> wrote: > >> Today I made a commit to my pull request which was created way before >> this change. Now the code quality test is failing because of exit code 1 by >> authors_update.py. Can you please help, so that I can clear the tests > > > Hi Prathamesh, > > I'm presuming that you have added the main sympy repo as a remote called > upstream. If you haven't yet done that then you can do that like: > > $ git remote add upstream https://github.com/sympy/sympy.git > > Now you can rebase your PR branch over the master branch in the main repo > like this: > > $ git checkout my_pr_branch_name > $ git fetch upstream > $ git rebase upstream/master > > The rebase might work straight away or it might encounter a merge > conflict. If there is a conflict then use git status a lot and read the > messages from git carefully - they do just about tell you how to resolve > the conflict. > > When the rebase is complete rerun the authors script and commit the changes > > $ bin/authors_update.py > $ git diff # <-- check what is actually changed > $ git add AUTHORS > $ git commit -m 'maint: update AUTHORS file' > > Finally you can force push to update the PR: > > $ git push --force > > > Oscar > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To view this discussion on the web visit > https://groups.google.com/d/msgid/sympy/CAHVvXxSMHwun7u6UtWkbb-4vaV9hHjgZa%3DmBi6iEToK4cD5RRg%40mail.gmail.com > <https://groups.google.com/d/msgid/sympy/CAHVvXxSMHwun7u6UtWkbb-4vaV9hHjgZa%3DmBi6iEToK4cD5RRg%40mail.gmail.com?utm_medium=email&utm_source=footer> > . > -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CAEiKfH%3DNTrtrpGZCEH_Gum8aEC2_d5QRMjnPDcLNeGMAUemXCg%40mail.gmail.com.
