search

jupyter-server / jupyter_ydoc

Jupyter document structures for collaborative editing using Yjs/pycrdt
https://jupyter-ydoc.readthedocs.io
BSD 3-Clause "New" or "Revised" License
28 stars 17 forks source link

Fix notebook undo scope #148

Closed fcollonval closed 1 year ago

fcollonval commented 1 year ago

This fixes the scoping of the undo manager on cells.

Xref: https://github.com/jupyterlab/jupyterlab/issues/10791

fcollonval commented 1 year ago

@meeseeksdev please backport to 0.2.x

lumberbot-app[bot] commented 1 year ago

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 0.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 bfc54ef02683ee61808c349bd72022e713408460

  2. You will likely have some merge/cherry-pick conflict here, fix them and commit:

git commit -am 'Backport PR #148: Fix notebook undo scope'
  1. Push to a named branch:
git push YOURFORK 0.2.x:auto-backport-of-pr-148-on-0.2.x
  1. Create a PR against branch 0.2.x, I would have named this PR:

"Backport PR #148 on branch 0.2.x (Fix notebook undo scope)"

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.