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

Upstream #482

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Upstream #482

wants to merge 20 commits into from

Conversation

aminya
Copy link
Member

@aminya aminya commented Nov 22, 2022

No description provided.

@DeeDeeG
Copy link
Member

DeeDeeG commented Dec 1, 2022

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 git commit --amend to update the merge commit. Equivalent to the steps I mentioned above).

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.

5 participants