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

Add chokidar to dev_mode/package.json #8481

Merged
merged 1 commit into from May 27, 2020
Merged

Conversation

jtpio
Copy link
Member

@jtpio jtpio commented May 27, 2020

References

#8469

Code changes

User-facing changes

None

Backwards-incompatible changes

None

@jupyterlab-dev-mode
Copy link

jupyterlab-dev-mode bot commented May 27, 2020

Thanks for making a pull request to JupyterLab!

To try out this branch on binder, follow this link: Binder

@jtpio
Copy link
Member Author

jtpio commented May 27, 2020

cc @blink1073

@blink1073 blink1073 added this to the 2.2 milestone May 27, 2020
Copy link
Member

@blink1073 blink1073 left a comment

Thanks!

@blink1073 blink1073 merged commit a31a4cf into jupyterlab:master May 27, 2020
39 checks passed
@blink1073
Copy link
Member

blink1073 commented May 27, 2020

@meeseeksdev please backport to 2.1.x

@meeseeksdev
Copy link

meeseeksdev bot commented May 27, 2020

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.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 a31a4cf625681524b44fe58847d8e253bd9e5650
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #8481: Add chokidar to dev_mode/package.json'
  1. Push to a named branch :
git push YOURFORK 2.1.x:auto-backport-of-pr-8481-on-2.1.x
  1. Create a PR against branch 2.1.x, I would have named this PR:

"Backport PR #8481 on branch 2.1.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@jtpio jtpio deleted the chokidar branch May 27, 2020
saulshanabrook pushed a commit that referenced this issue Jun 25, 2020
Add chokidar to dev_mode/package.json
@github-actions github-actions bot added the status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. label Feb 9, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. tag:Extensions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants