Incorporate main branch changes into ADR-127 branch#119
Closed
Copilot wants to merge 2 commits intodev/jodavis/ADR-128-spec-programmable-ir-commandsfrom
Closed
Incorporate main branch changes into ADR-127 branch#119Copilot wants to merge 2 commits intodev/jodavis/ADR-128-spec-programmable-ir-commandsfrom
Copilot wants to merge 2 commits intodev/jodavis/ADR-128-spec-programmable-ir-commandsfrom
Conversation
…laude rules) Co-authored-by: jodavis <6740581+jodavis@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix flakiness in end to end tests for programmable IR commands
Incorporate main branch changes into ADR-127 branch
Mar 11, 2026
Owner
|
I wanted to rebase this, not merge changes from main. I'll do it locally since copilot wasn't allowed to force push the branch. |
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.
This branch was behind main by two commits. Brings in
9113844(error handling/lifecycle improvements) and4bdfd78(Claude rules) with three merge conflicts resolved.Conflict resolutions
ApplicationScopeContainer.cs— Combined both improvements:using (linkedCts)for properCancellationTokenSourcedisposal (our branch) +WaitAsync(linkedCts.Token)for task cancellation (main)AdaptiveRemoteHost.Builder.cs— Merged main'sStart(overrideSettings?)+StartWithSettingsrefactor with ourConfigureTestServicespre-build injection support; renamed shadowing parameter_settings→effectiveSettingsinStartWithSettingsSimulatedEnvironment.cs— Kept ourEnsureTestSettingsFileCreated/WriteTestSettingsFilelogic for programmatic IR command config; log file path continues to flow throughEnsureHostStartedviaoverrideSettings(main's approach)🔒 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.