Merge main into dev for v2.1.0 release#406
Merged
erikdarlingdata merged 6 commits intodevfrom Mar 3, 2026
Merged
Conversation
Scheduled at 6:00 AM UTC (1:00 AM EST), builds from dev branch. Skips if no new commits in 24 hours. Creates a rolling "nightly" pre-release with Dashboard, Lite, and Installer zips. Also supports manual trigger via workflow_dispatch. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Add nightly build workflow
Merge dev to main
Revert premature dev-to-main merge (PR #352)
# Conflicts: # Dashboard/Controls/MemoryContent.xaml.cs # Dashboard/Controls/PlanViewerControl.xaml # Dashboard/Controls/PlanViewerControl.xaml.cs # Dashboard/Controls/ResourceMetricsContent.xaml.cs # Dashboard/Controls/SystemEventsContent.xaml.cs # Dashboard/Models/PlanModels.cs # Dashboard/Services/PlanAnalyzer.cs # Dashboard/Services/ShowPlanParser.cs # Lite/Controls/PlanViewerControl.xaml.cs # Lite/Controls/ServerTab.xaml.cs # Lite/Models/PlanModels.cs # Lite/Services/PlanAnalyzer.cs # Lite/Services/RemoteCollectorService.QueryStore.cs # Lite/Services/RemoteCollectorService.ServerConfig.cs # Lite/Services/ShowPlanParser.cs # README.md # install/09_collect_query_store.sql # install/39_collect_database_configuration.sql
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
1 participant
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.
Summary
Context
The revert commit on main (7d8130a) caused merge conflicts when PRing dev→main. This PR brings main's history into dev so the subsequent dev→main release PR will be conflict-free.
🤖 Generated with Claude Code