Skip to content

v3.1-dev: resolve conflicts that prevent a direct merge from dev #4417

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
merged 7 commits into from
Mar 13, 2025
Merged

v3.1-dev: resolve conflicts that prevent a direct merge from dev #4417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bcc030
Delete schema.yaml
ralfhandl Mar 6, 2025
3b45fd4
Update CONTRIBUTING.md
ralfhandl Mar 6, 2025
ca0b2f7
Revert "Update CONTRIBUTING.md"
ralfhandl Mar 6, 2025
c609a46
Revert "Update CONTRIBUTING.md"
ralfhandl Mar 6, 2025
67ac64d
Revert "Update CONTRIBUTING.md"
ralfhandl Mar 6, 2025
fb2bc8e
Revert "Update CONTRIBUTING.md"
ralfhandl Mar 6, 2025
86f3f67
Revert "Update CONTRIBUTING.md"
ralfhandl Mar 6, 2025
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
5 changes: 0 additions & 5 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,6 @@ Plus some suggestions, rather than rules:
* property of a "plain" JSON object that is not an OpenAPI-defined Foo Object -> "property"
* "attribute" is only used in the XML context and means "XML attribute"

### Field Names and Values in YAML comments

Field names and keywords should be in backticks.
Values like "Dog" should be double quoted.

Comment on lines -217 to -221
Copy link
Contributor Author

@ralfhandl ralfhandl Mar 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section was added to the style guide in main and should never have been added to this outdated state of CONTRIBUTING.md. Removing it resolves the conflict.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw this change did make it into main over in style-guide.md. 👍

## Release Process and Scope

This section relates to the 3.x versions only.
Expand Down
Loading