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

Update return type of iterator_count and iterator_apply functions to 0|positive-int #7331

Merged
merged 1 commit into from Jan 7, 2022

Conversation

ricardoboss
Copy link
Contributor

No description provided.

@orklah
Copy link
Collaborator

orklah commented Jan 7, 2022

Can you please rebase on 4.x? commits on master will only be released in Psalm 5

@ricardoboss
Copy link
Contributor Author

Should I reopen the PR targeting the 4.x branch?

@orklah
Copy link
Collaborator

orklah commented Jan 7, 2022

You should follow those steps:

  1. git rebase -i upstream/4.x (assuming your remote for this repo is named upstream)
  2. resolve any conflict git tells you to (I don't expect any here)
  3. once it's done git push --force
  4. Come back here and next to the title of your PR, click on Edit and you'll be able to change the target of your PR to match with your rebase

@ricardoboss ricardoboss changed the base branch from master to 4.x January 7, 2022 11:37
@weirdan weirdan added the release:fix The PR will be included in 'Fixes' section of the release notes label Jan 7, 2022
@weirdan weirdan merged commit 9bd28a2 into vimeo:4.x Jan 7, 2022
@weirdan
Copy link
Collaborator

weirdan commented Jan 7, 2022

Thanks!

@ricardoboss ricardoboss deleted the iterator-count-is-positive branch January 7, 2022 11:47
ricardoboss added a commit to elephox-dev/framework that referenced this pull request Feb 2, 2022
ricardoboss added a commit to elephox-dev/collection that referenced this pull request Feb 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release:fix The PR will be included in 'Fixes' section of the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants