Skip to content

Conversation

@AndrewILWilliams
Copy link
Contributor

Fixing typo in recent PR #4089

@pep8speaks
Copy link

pep8speaks commented May 26, 2020

Hello @AndrewWilliams3142! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2020-05-26 17:45:03 UTC

@AndrewILWilliams
Copy link
Contributor Author

Also, could I ask a git question? Is there a way of getting a "clean" version of xarray to do PR branches off of without just re-forking? I've tried a few different suggestions on StackOverflow but just keen to know what other people's workflow is :) thanks again

@keewis
Copy link
Collaborator

keewis commented May 26, 2020

thanks, @AndrewWilliams3142.

About git / github: I think the most common workflow is that you have a local branch (commonly named master, but could be anything) that tracks origin/master and a lot of features branches you use to open PRs. If you think there are changes to master you need in your branch (or because Github complains about merge conflicts), you can use

git checkout master
git pull origin master  # could also be `git pull` or `git pull origin`
git checkout <feature-branch>
git merge master

@keewis keewis merged commit 864877c into pydata:master May 26, 2020
@AndrewILWilliams AndrewILWilliams deleted the corrcov-typo-fix branch May 26, 2020 19:34
@max-sixty
Copy link
Collaborator

Cheers @AndrewWilliams3142 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants