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

PR: walk does not return a value #578

Merged
merged 6 commits into from Dec 6, 2022
Merged

PR: walk does not return a value #578

merged 6 commits into from Dec 6, 2022

Conversation

edreamleo
Copy link
Contributor

@edreamleo edreamleo commented Dec 6, 2022

I was sure this change had been merged into master, but apparently not.

  • mypy complained that walk should not return a value.
  • pylint complained that either all return statements should return a value, or no return statement should return a value.

@edreamleo
Copy link
Contributor Author

@lieryan Is there anything I can do to remove the do-nothing previous 5 commits from further PRs?

I've never used or understood squash or rebase.

@lieryan
Copy link
Member

lieryan commented Dec 6, 2022

I suppose the reason why you keep seeing the do-nothing commits is because these commits are in your local master. Assuming that origin is the rope's main repository master, you'll want to git reset origin/master to set your local master to the main repository's master. You'll also want to make sure that your fork's master doesn't contain these additional commit, so after you git reset your local branch, you'll want to git push --force ekr-rope master:master.

For more complex situations, for example if your master do contain something you want to preserve, you're going to want to use git rebase to select the commits to preserve, but if you just want to sync up with main repository, then git reset is simpler.

@lieryan lieryan merged commit 74a937d into python-rope:master Dec 6, 2022
@edreamleo edreamleo deleted the ekr-walk branch December 6, 2022 14:58
@edreamleo
Copy link
Contributor Author

@lieryan Many thanks for your help.

@lieryan lieryan added this to the 1.6.0 milestone Dec 14, 2022
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.

None yet

2 participants