Just a thought: Might want to just cherry-pick https://github.com/atom-community/atom/pull/482/commits/6b696d632941c18a683d01eaf0bf3dc38daf6ca7, 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 https://github.com/atom-community/atom/pull/482/commits/6b696d632941c18a683d01eaf0bf3dc38daf6ca7, 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 https://github.com/atom-community/atom/pull/482/commits/6b696d632941c18a683d01eaf0bf3dc38daf6ca7. (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).
Just a thought: Might want to just cherry-pick https://github.com/atom-community/atom/pull/482/commits/6b696d632941c18a683d01eaf0bf3dc38daf6ca7, 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 https://github.com/atom-community/atom/pull/482/commits/6b696d632941c18a683d01eaf0bf3dc38daf6ca7, 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 https://github.com/atom-community/atom/pull/482/commits/6b696d632941c18a683d01eaf0bf3dc38daf6ca7. (Or do the entire merge, make the changes you want, and do
git commit --amendto update the merge commit. Equivalent to the steps I mentioned above).