Resolve merge conflicts between electron-docs PR and main#506
Draft
Copilot wants to merge 2 commits intoriderx/electron-docsfrom
Draft
Resolve merge conflicts between electron-docs PR and main#506Copilot wants to merge 2 commits intoriderx/electron-docsfrom
Copilot wants to merge 2 commits intoriderx/electron-docsfrom
Conversation
Co-authored-by: riderx <4084527+riderx@users.noreply.github.com>
|
Copilot
AI
changed the title
[WIP] Document Electron support in update docs
Resolve merge conflicts between electron-docs PR and main
Feb 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #495 (
riderx/electron-docs) had diverged frommainin 4 files wheremainreceived independent fixes after the branch was cut.Conflict resolutions
faq.mdx: hyphenation fixes —over-the-air updates,production-readytroubleshooting.mdx: add missing#### Electron Logssection (main-process/renderer log steps, DevTools, OS log tools for macOS/Windows/Linux)plugin/api.md:responseTimeoutdefault corrected:20 // (20 second)→20000 // (20 seconds)resetWhenUpdatedescription:auto update flow→auto-update flowdirectUpdatetype: unescaped|→\|autoSplashscreen,autoSplashscreenLoader,autoSplashscreenTimeout,allowShakeChannelSelector: platform availability reverted toAndroid and iOSonly (splash-screen APIs are not supported on Electron)plugins/updater/api.md: sameresponseTimeoutandautoSplashscreenfixes as above💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.