Merge main into Multiple Export Formats (resolve conflicts)#8
Draft
Copilot wants to merge 2 commits intoauto-claude/013-multiple-export-formats-csv-json-summaryfrom
Draft
Merge main into Multiple Export Formats (resolve conflicts)#8Copilot wants to merge 2 commits intoauto-claude/013-multiple-export-formats-csv-json-summaryfrom
Copilot wants to merge 2 commits intoauto-claude/013-multiple-export-formats-csv-json-summaryfrom
Conversation
Co-authored-by: elmoritz <2924483+elmoritz@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix merge conflicts for multiple export formats
Merge main into Multiple Export Formats (resolve conflicts)
Mar 1, 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 #7 had conflicts with main after it received three independent feature merges: swift-glob migration, coverage threshold gating, and the trend command.
Conflict Resolution
Package / dependency changes
GlobPatternwithswift-globinPackage.swiftandPackage.resolvedTrendtarget definition and dependencyCollection+Glob.swiftimport GlobPattern→import GlobCoverageCommand.swift— merged both sides--format(this PR) + added--min-coverage/--max-dropandloadThresholdSettings()(from main)CoverageTool.swift— merged both sidesformatproperty and format-based routing (this PR) + addedthresholdSettingsandvalidateThresholds()(from main)GithubExport.swift— merged both sidesvalidationResultsparameter tocreateMarkDownReport(from main), passing it through toMarkdownEncoderTypeMarkDownEncoder.swiftvalidationResults: [ThresholdValidationResult]?on all ranked/detailed/header cases, rendering threshold pass/fail indicators when presentNew files pulled from main
Sources/Command/Trend/—TrendCommand,TrendTool,TrendError,DerivedDataCommand+HelpersSources/Helper/Exporters/Charts/—SVGChartGenerator,TrendChartDataSources/Helper/Threshold/ThresholdValidator.swiftSources/Command/Coverage/ThresholdValidator.swiftSources/Shared/Config/Config+Thresholds.swift,ThresholdSettings.swift,ThresholdValidationResult.swiftOther files updated to main
App.swift,Config.swift,Config+Tool.swift,CoverageError.swift(threshold error cases), DBHandler models/repository (getLatestReport, fetch helpers, public access modifiers)💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.