Repository navigation
Resolve .gitattributes conflict markers and remove unused generator table - #143
Merged
Merged
Conversation
A Copier update in 2025 committed both sides of a conflict. Keep the template's per-extension line ending rules. Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
The table mapped MSVC toolset versions to CMake generator names. It was added with the vcpkg toolchain work and never read. CMake now picks the generator itself, and the table already lacked Visual Studio 2026. Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Contributor
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #143 +/- ##
==========================================
- Coverage 97.71% 97.71% -0.01%
==========================================
Files 16 16
Lines 1578 1577 -1
==========================================
- Hits 1542 1541 -1
Misses 36 36 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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.
Description
.gitattributescontained both sides of a merge conflict from a 2025 Copier update. It now matches the template: line ending rules for.md,.py,.toml, and.yaml.DefaultMSVCGeneratorinhatch_cpp/toolchains/cmake.pymapped MSVC toolset versions to CMake generator names. It was added with the vcpkg toolchain work and never read. Since Run tests on macOS and Windows and fix the Windows failures #142 CMake picks the generator itself, and the table already lacked Visual Studio 2026, so it is removed.Type of Change
Checklist
make lint)make test)