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

whats new 7.33 #13660

Merged
merged 1 commit into from Apr 29, 2022
Merged

whats new 7.33 #13660

merged 1 commit into from Apr 29, 2022

Conversation

Carreau
Copy link
Member

@Carreau Carreau commented Apr 29, 2022

No description provided.

@Carreau Carreau added this to the 7.33 milestone Apr 29, 2022
@Carreau Carreau merged commit 7710e23 into ipython:master Apr 29, 2022
@Carreau
Copy link
Member Author

Carreau commented Apr 29, 2022

@meeseeksdev backport to 7.x

@lumberbot-app
Copy link
Contributor

lumberbot-app bot commented Apr 29, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 7.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 7710e239f9295e61b87032c47509d3cc7e218eb4
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #13660: whats new 7.33'
  1. Push to a named branch:
git push YOURFORK 7.x:auto-backport-of-pr-13660-on-7.x
  1. Create a PR against branch 7.x, I would have named this PR:

"Backport PR #13660 on branch 7.x (whats new 7.33)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@lumberbot-app lumberbot-app bot added the Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR. label Apr 29, 2022
Carreau added a commit to Carreau/ipython that referenced this pull request Apr 29, 2022
whats new 7.33

(cherry picked from commit 7710e23)
@Carreau Carreau removed the Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR. label Apr 29, 2022
Carreau added a commit that referenced this pull request Apr 29, 2022
@Carreau Carreau deleted the wn733 branch August 30, 2022 14:51
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

1 participant