Skip to content

Whats new 8.12.3#14174

Merged
Carreau merged 1 commit intoipython:mainfrom
Carreau:wn-8123
Sep 29, 2023
Merged

Whats new 8.12.3#14174
Carreau merged 1 commit intoipython:mainfrom
Carreau:wn-8123

Conversation

@Carreau
Copy link
Copy Markdown
Member

@Carreau Carreau commented Sep 29, 2023

No description provided.

@Carreau Carreau added this to the 8.12.3 milestone Sep 29, 2023
@Carreau Carreau merged commit 2078881 into ipython:main Sep 29, 2023
@lumberbot-app
Copy link
Copy Markdown
Contributor

lumberbot-app bot commented Sep 29, 2023

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 8.12.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 20788814959b785008047a0a5648c55700eb3cdd
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #14174: Whats new 8.12.3'
  1. Push to a named branch:
git push YOURFORK 8.12.x:auto-backport-of-pr-14174-on-8.12.x
  1. Create a PR against branch 8.12.x, I would have named this PR:

"Backport PR #14174 on branch 8.12.x (Whats new 8.12.3)"

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 Sep 29, 2023
Carreau added a commit to Carreau/ipython that referenced this pull request Sep 29, 2023
Carreau added a commit that referenced this pull request Sep 29, 2023
@Carreau Carreau deleted the wn-8123 branch May 31, 2024 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant