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.

Sign up for GitHub

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

Jump to bottom

Finish What's new for 7.18 #12517

Merged
merged 1 commit into from Aug 28, 2020
Merged

Finish What's new for 7.18 #12517

merged 1 commit into from Aug 28, 2020

Conversation

Carreau
Copy link
Member

@Carreau Carreau commented Aug 28, 2020

No description provided.

@Carreau Carreau added this to the 7.18 milestone Aug 28, 2020
@Carreau Carreau merged commit aa2b548 into ipython:master Aug 28, 2020
@Carreau Carreau deleted the wn-718-ii branch August 28, 2020 19:11
@lumberbot-app
Copy link
Contributor

lumberbot-app bot commented Aug 28, 2020

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 aa2b54815c55c2f229de8c57e20a757d1b27ffd7
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am "Backport PR #12517: Finish What's new for 7.18"
  1. Push to a named branch :
git push YOURFORK 7.x:auto-backport-of-pr-12517-on-7.x
  1. Create a PR against branch 7.x, I would have named this PR:

"Backport PR #12517 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 Aug 28, 2020
@Carreau
Copy link
Member Author

Carreau commented Aug 28, 2020

@meeseeksdev backport to 7.x

meeseeksmachine pushed a commit to meeseeksmachine/ipython that referenced this pull request Aug 28, 2020
@Carreau @meeseeksmachine
Backport PR ipython#12517: Finish What's new for 7.18
4e0e8a6
@meeseeksmachine meeseeksmachine mentioned this pull request Aug 28, 2020
Merged
@Carreau Carreau removed the Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR. label Aug 28, 2020
Carreau added a commit that referenced this pull request Aug 28, 2020
@Carreau
Merge pull request #12520 from meeseeksmachine/auto-backport-of-pr-12…
b9ab601 
…517-on-7.x

Backport PR #12517 on branch 7.x (Finish What's new for 7.18)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.18
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@Carreau