fix: resolve conflicts with main, preserve Electron platform additions#504
Draft
Copilot wants to merge 2 commits intoriderx/electron-docsfrom
Draft
fix: resolve conflicts with main, preserve Electron platform additions#504Copilot wants to merge 2 commits intoriderx/electron-docsfrom
Copilot wants to merge 2 commits intoriderx/electron-docsfrom
Conversation
…itions Co-authored-by: riderx <4084527+riderx@users.noreply.github.com>
|
Copilot
AI
changed the title
[WIP] Document Electron support in update docs
fix: resolve conflicts with main, preserve Electron platform additions
Feb 27, 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.
Branch was behind main by 10+ commits touching overlapping files. Rebasing wasn't available, so conflicts were resolved manually.
Changes
capgo-availability.mdx,cloud-build/configuration.mdx), updated message catalogs (all locales), plugin tutorial docs, CLI reference pages, and bug bounty/security pagesplugin/api.md:autoSplashscreen,autoSplashscreenLoader,autoSplashscreenTimeout,allowShakeChannelSelector— availability updated fromAndroid and iOS→Android, iOS, and Electronplugins/updater/api.md:autoSplashscreen— same availability updateAll other content (wording fixes, new sections like "Electron Logs" in troubleshooting) was taken from main as-is.
🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.