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

Fix tests #288

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Fix tests #288

merged 1 commit into from
Nov 12, 2024

Conversation

davidbrochart
Copy link
Collaborator

No description provided.

@davidbrochart davidbrochart merged commit df1297f into jupyter-server:main Nov 12, 2024
10 checks passed
@davidbrochart davidbrochart deleted the tests branch November 12, 2024 14:13
@davidbrochart
Copy link
Collaborator Author

@meeseeksdev please backport to 2.x

Copy link

lumberbot-app bot commented Nov 29, 2024

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

"Backport PR #288 on branch 2.x (Fix tests)"

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.

davidbrochart added a commit to davidbrochart/jupyter_ydoc that referenced this pull request Nov 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant