Skip to content
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

chore: enable merge flag for generated bindings #10082

Merged
merged 1 commit into from
Nov 13, 2024
Merged

chore: enable merge flag for generated bindings #10082

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

# ignore generated code for cli diffs and merges. treat as binary.
# ignore generated code for GitHub UIs.
proto/pkg/**/* -diff -merge linguist-generated=true
master/pkg/schemas/expconf/zgen_* -diff -merge linguist-generated=true
webui/react/src/services/api-ts-sdk/**/* -diff -merge linguist-generated=true
webui/react/src/services/stream/wire.ts -diff -merge linguist-generated=true
harness/determined/common/api/bindings.py -diff -merge linguist-generated=true
harness/determined/common/streams/wire.py -diff -merge linguist-generated=true
docs/swagger-ui/swagger-ui*js* -diff -merge
proto/pkg/**/* -diff linguist-generated=true
master/pkg/schemas/expconf/zgen_* -diff linguist-generated=true
webui/react/src/services/api-ts-sdk/**/* -diff linguist-generated=true
webui/react/src/services/stream/wire.ts -diff linguist-generated=true
harness/determined/common/api/bindings.py -diff linguist-generated=true
harness/determined/common/streams/wire.py -diff linguist-generated=true
docs/swagger-ui/swagger-ui*js* -diff
docs/swagger-ui/swagger-ui-main* diff merge
Loading