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

fixup release note and testing #12874

Merged
merged 1 commit into from Mar 27, 2021
Merged

fixup release note and testing #12874

merged 1 commit into from Mar 27, 2021

Conversation

Carreau
Copy link
Member

@Carreau Carreau commented Mar 27, 2021

No description provided.

@Carreau Carreau changed the title fiup release note and testing fixup release note and testing Mar 27, 2021
@Carreau Carreau added this to the 7.22 milestone Mar 27, 2021
@Carreau Carreau merged commit 1e7c2ca into ipython:master Mar 27, 2021
@lumberbot-app
Copy link
Contributor

lumberbot-app bot commented Mar 27, 2021

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 -m1 1e7c2ca36d658fb2b835001a42d393d1e4e57386
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #12874: fixup release note and testing'
  1. Push to a named branch :
git push YOURFORK 7.x:auto-backport-of-pr-12874-on-7.x
  1. Create a PR against branch 7.x, I would have named this PR:

"Backport PR #12874 on branch 7.x"

And apply the correct labels and milestones.

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

If these instruction 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 Mar 27, 2021
Carreau added a commit to Carreau/ipython that referenced this pull request Mar 27, 2021
Carreau added a commit to Carreau/ipython that referenced this pull request Mar 27, 2021
Carreau added a commit to Carreau/ipython that referenced this pull request Mar 27, 2021
Carreau added a commit that referenced this pull request Mar 27, 2021
@Carreau Carreau removed the Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR. label Mar 27, 2021
@Carreau Carreau deleted the fix-rn-test branch December 9, 2021 00: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