-
Notifications
You must be signed in to change notification settings - Fork 30
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
Upstream #482
base: master
Are you sure you want to change the base?
Upstream #482
Conversation
Co-Authored-By: Ashley Wolf <[email protected]>
install from github
Due to the instability of atom's package api, we have the CI process failing to install some packages. This failure is random and there is no way to have consistent results.
Disable tests.
Remove dependancies.
Fix `File` -> `Open…` menu on macOS
Just a thought: Might want to just cherry-pick 6b696d6, which is a macOS-specific fix for something that broke when upgrading to Electron 11, and not take the other commits, since they are all related to adding the sunset message. Considering that the sunset message is kind of not important or not super relevant for an ongoing fork to show. Or if including all the commits in the history of this fork is important, for example so GitHub stops saying this fork is "behind"... it is possible to start the merge, and then paste the working tree files so they match this repo from before the merge, maybe with just the change from 6b696d6, stage changes and commit that, which completes the merge. Then the merge will essentially show that someone looked at all the changes from upstream, but the only changes that were actually wanted were the diff from 6b696d6. (Or do the entire merge, make the changes you want, and do |
No description provided.