Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed string formatting to fstring #29865

Closed
wants to merge 4 commits into from

Conversation

ForTimeBeing
Copy link
Contributor

@ForTimeBeing ForTimeBeing commented Nov 26, 2019

I am new to contributing to open source projects bare with me. I normally only push to my own
master branch. I have never used git diff before(I know it is supposed to compare changed) and I just keep getting the error: fatal: bad revision 'upstream/master' if someone could tell me how to properly use it that would be great! It passed the black pandas test though. Once I figure out how to properly submit a PR abiding by pandas standards I will do trying a lot more PR. This is only a sample

@datapythonista datapythonista added the Code Style Code style, linting, code_checks label Nov 26, 2019
Copy link
Member

@datapythonista datapythonista left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the changes @ForTimeBeing

You should have git remotes for:

  • origin: your fork
  • upstream: this repo (pandas-dev/pandas)

Something like git remote add upstream [email protected]:pandas-dev/pandas.git should leave this correct if you cloned your fork, and the diff should work.

@ForTimeBeing
Copy link
Contributor Author

Thanks for the changes @ForTimeBeing

You should have git remotes for:

* `origin`: your fork

* `upstream`: this repo (pandas-dev/pandas)

Something like git remote add upstream [email protected]:pandas-dev/pandas.git should leave this correct if you cloned your fork, and the diff should work.

I now have upstreams as well:

origin https://github.com/ForTimeBeing/pandas.git (fetch)
origin https://github.com/ForTimeBeing/pandas.git (push)
upstream [email protected]:pandas-dev/pandas.git (fetch)
upstream [email protected]:pandas-dev/pandas.git (push)

I am still getting the bad revision though

@datapythonista
Copy link
Member

run git fetch upstream first

Copy link
Member

@simonjayhawkins simonjayhawkins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ForTimeBeing lgtm pending ci fixes

@simonjayhawkins simonjayhawkins added this to the 1.0 milestone Nov 26, 2019
@simonjayhawkins
Copy link
Member

@ForTimeBeing can you merge master to fix ci issues.

@WillAyd
Copy link
Member

WillAyd commented Dec 17, 2019

@ForTimeBeing can you try one more merge of master?

@jbrockmendel
Copy link
Member

GH is showing me a zero-file diff. Have these changes already been merged?

@datapythonista
Copy link
Member

I guess this has been addressed elsewhere. Closing.

@ForTimeBeing
Copy link
Contributor Author

ForTimeBeing commented Dec 25, 2019

I apologize, I have not been around because of the holiday

Happy holidays everyone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Clean Code Style Code style, linting, code_checks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants