added deprecate_nonkeyword_arguments to function where by Jiezheng2018 · Pull Request #41523 · pandas-dev/pandas (original) (raw)

Glad to hear you're learning a lot from this 😄

In a different PR (#41580 (comment)), Jeff has asked for other to be positional, so let's change this to be allowed_args=["self", "cond"] - sorry for having midled you!

No problem at all. I haven't made much progress because I kept running into problems each time I do a git fetch upstream and git merge upstream/master. (My understanding is that I should do this each time before I start working, right?)

I can't merge successfully because other people are also working on the same file (which is to be expected). However, what is really confusing for me is that the merge still fails sometimes, even after I removed all my changes. Error messages are to do with uncommitted changes. Trying git commit then I start failing on other pre-commit checks, either black, flake8 or absolufy-imports. Am I doing something stupid here?

I bypassed the above eventually by discarding all of my changes and aborted the merge and used git checkout --theirs .
Is this the correct way of doing it?