Skip to content

Resolve .gitattributes conflict markers and remove unused generator table #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timkpaine merged 2 commits into from
Nov 14, 2026
Merged

Resolve .gitattributes conflict markers and remove unused generator table #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e34df
Resolve merge conflict markers in .gitattributes
timkpaine Nov 14, 2026
0a4715f
Remove unused DefaultMSVCGenerator table
timkpaine Nov 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ docs/* linguist-documentation
*.ipynb linguist-documentation
Makefile linguist-documentation

<<<<<<< before updating
* text=auto eol=lf
=======
*.md text=auto eol=lf
*.py text=auto eol=lf
*.toml text=auto eol=lf
*.yaml text=auto eol=lf
>>>>>>> after updating
10 changes: 0 additions & 10 deletions hatch_cpp/toolchains/cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@

__all__ = ("HatchCppCmakeConfiguration",)

DefaultMSVCGenerator = {
"12": "Visual Studio 12 2013",
"14": "Visual Studio 14 2015",
"14.0": "Visual Studio 14 2015",
"14.1": "Visual Studio 15 2017",
"14.2": "Visual Studio 16 2019",
"14.3": "Visual Studio 17 2022",
"14.4": "Visual Studio 17 2022",
}


class HatchCppCmakeConfiguration(BaseModel):
root: Path | None = None
Expand Down
Loading