search

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

Update CI (#396) #399

Closed trungleduc closed 2 weeks ago

trungleduc commented 2 weeks ago

Backport #396

github-actions[bot] commented 2 weeks ago

Binder :point_left: Launch a Binder on branch trungleduc/jupyter-collaboration/backport

davidbrochart commented 2 weeks ago

Should we just rebase the suggestions branch on main instead of creating a PR?

trungleduc commented 2 weeks ago

Should we just rebase the suggestions branch on main instead of creating a PR?

I don't have the right to rebase this branch. It would be great if you could set up the backport bot. Maybe @jtpio knows how to do?

davidbrochart commented 2 weeks ago

But even if we set up a backport bot, we will end up with a bunch of commits that are different from main, right?

trungleduc commented 2 weeks ago

yep, but at least I don't need to ask you to rebase this branch every time.

trungleduc commented 2 weeks ago

@davidbrochart let's merge this?

jtpio commented 2 weeks ago

@meeseeksdev hello

(to test if the bot is enabled here)

lumberbot-app[bot] commented 2 weeks ago

I'm Mr. Meeseek, @jtpio, Look at meee !

davidbrochart commented 2 weeks ago

@davidbrochart let's merge this?

I'm just a bit worried about when we merge branch suggestions into main. Won't we get a bunch of conflicts?

trungleduc commented 2 weeks ago

@davidbrochart let's merge this?

I'm just a bit worried about when we merge branch suggestions into main. Won't we get a bunch of conflicts?

Theoretically no since we resolved conflicts on each backport PR. We can test it by merging this PR and then opening a PR to merge this branch to main. The diff should only be your code, not the code from this backport PR

davidbrochart commented 2 weeks ago

I agree that the diff should only be our code, but I think the backport PRs will still be seen as conflicts. Anyway, let's see with this one as you said :+1: