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

Wait for python server then reload #12

Merged
merged 8 commits into from
Sep 8, 2024
Merged

Wait for python server then reload #12

merged 8 commits into from
Sep 8, 2024

Conversation

KenCorma
Copy link
Collaborator

@KenCorma KenCorma commented Sep 5, 2024

No description provided.

Copy link

socket-security bot commented Sep 5, 2024

New dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@electron-forge/[email protected] filesystem 0 13.3 kB vertedinde
npm/[email protected] filesystem 0 1.81 MB linusu
npm/[email protected] None 0 159 kB aearly
npm/[email protected] None 0 8.78 kB linusu
npm/[email protected] None 0 54.6 kB joeferner
npm/[email protected] filesystem 0 35 kB linusu
npm/[email protected] filesystem 0 1.2 MB erickzhao
npm/[email protected] None 0 4.03 kB linusu
npm/[email protected] None 0 2.94 kB linusu
npm/[email protected] filesystem 0 17.5 kB linusu
npm/[email protected] None 0 31.8 kB linusu
npm/[email protected] eval 0 9.04 kB mafintosh
npm/[email protected] None 0 2.75 kB mafintosh
npm/[email protected] filesystem 0 30.5 kB netroy
npm/[email protected] None 0 2.46 kB sindresorhus
npm/[email protected] None 0 21.1 kB linusu
npm/[email protected] None 0 40.2 kB linusu
npm/[email protected] None 0 13.6 kB mikolalysenko
npm/[email protected] None 0 6.75 kB marcbachmann
npm/[email protected] filesystem 0 19.3 kB linusu
npm/[email protected] None 0 3.73 kB linusu
npm/[email protected] None 0 430 kB kkoopa
npm/[email protected] None 0 9.93 kB substack
npm/[email protected] None 0 3.9 kB linusu
npm/[email protected] None 0 9.09 kB jonschlinkert
npm/[email protected] None 0 105 kB samcday
npm/[email protected] None 0 9.44 kB linusu
npm/[email protected] None 0 2.9 kB linusu
npm/[email protected] None 0 151 kB walling
npm/[email protected] None 0 6.46 kB raynos

View full report↗︎

@telamonian
Copy link
Contributor

@KenCorma Could you please wait a few hours before merging this in? I'm trying to fix all of the conflicts right now between #8 and all of the work you've done in the last couple of days

@KenCorma
Copy link
Collaborator Author

KenCorma commented Sep 5, 2024

That's fine this is in no rush.

@telamonian
Copy link
Contributor

Thanks. The only thing worse than fixing merge conflicts is fixing merge conflicts with a moving target

@KenCorma
Copy link
Collaborator Author

KenCorma commented Sep 5, 2024

Thanks. The only thing worse than fixing merge conflicts is fixing merge conflicts with a moving target

Feel you on that one, I am done for today so Ill take a look at it when ever you are ready.

@telamonian
Copy link
Contributor

@KenCorma Okay, I'm all done with the conflict resolve on #8 finally. Only problem left is that the changes to main.ts in this PR will conflict with changes to main.ts in #8. If this PR is finished, could you please merge this in first, and then I'll deal with any fallout on #8

@telamonian
Copy link
Contributor

I finished up #8 and decided to pull it in first after all. To make up for it, I fixed the merge conflict that #8 caused in this PR

@KenCorma
Copy link
Collaborator Author

KenCorma commented Sep 7, 2024

Thank you, sorry about that I got busy. I will resolve everything tomorrow.

@KenCorma KenCorma merged commit 8484686 into main Sep 8, 2024
4 checks passed
@KenCorma KenCorma deleted the dev-kendal-status branch September 8, 2024 23:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants