Closed trungleduc closed 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
Yes I was expecting something like that.
If we keep using backport PRs but do the rebase when we decide to merge suggession
to main
, it should be ok?
Could you try to rebase locally, and see how it goes?
Could you try to rebase locally, and see how it goes?
it's the same as rebase without the backport PR
but I agree It's cleaner by rebasing regularly the suggestions
branch
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?
but I agree It's cleaner by rebasing regularly the
suggestions
branchI 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.
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.
I gave you maintainer rights, if it's not enough I'll give you admin rights.
Great! Thanks
:point_left: Launch a Binder on branch jupyterlab/jupyter-collaboration/suggestions