jupyterlab / jupyter-collaboration

A Jupyter Server Extension Providing Support for Y Documents
https://jupyterlab-realtime-collaboration.readthedocs.io/en/latest/
Other
169 stars 31 forks source link

Test suggestion PR #400

Closed trungleduc closed 2 weeks ago

github-actions[bot] commented 2 weeks ago

Binder :point_left: Launch a Binder on branch jupyterlab/jupyter-collaboration/suggestions

trungleduc commented 2 weeks ago

Hmm, there is no conflict but the diff is still showing the code existing on main. It would be annoying for reviewers

davidbrochart commented 2 weeks ago

Yes I was expecting something like that.

trungleduc commented 2 weeks ago

If we keep using backport PRs but do the rebase when we decide to merge suggession to main, it should be ok?

davidbrochart commented 2 weeks ago

Could you try to rebase locally, and see how it goes?

trungleduc commented 2 weeks ago

Could you try to rebase locally, and see how it goes?

it's the same as rebase without the backport PR

trungleduc commented 2 weeks ago

but I agree It's cleaner by rebasing regularly the suggestions branch

davidbrochart commented 2 weeks ago

but I agree It's cleaner by rebasing regularly the suggestions branch

I would prefer doing that, maybe we can allow it on the suggestions branch, or we do it on our forks?

trungleduc commented 2 weeks ago

but I agree It's cleaner by rebasing regularly the suggestions branch

I would prefer doing that, maybe we can allow it on the suggestions branch, or we do it on our forks?

Is the forced-push protection rule applied only to the main branch? If that's the case let's do it directly on the suggestions branch. If you can give the commit right here I can also help doing the rebase.

davidbrochart commented 2 weeks ago

I just rebased suggestions on main, so the force-push protection rule doesn't apply to suggestions. Let me see if I can give you rights on this repo.

davidbrochart commented 2 weeks ago

I gave you maintainer rights, if it's not enough I'll give you admin rights.

trungleduc commented 2 weeks ago

Great! Thanks