v3.1-dev: resolve conflicts that prevent a direct merge from dev #4417
Conversation
This file contains 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
This was referenced Mar 6, 2025
ralfhandl
commented
Mar 6, 2025
Comment on lines
-217
to
-221
| ### Field Names and Values in YAML comments | ||
|
|
||
| Field names and keywords should be in backticks. | ||
| Values like "Dog" should be double quoted. | ||
|
|
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
I saw this change did make it into main over in style-guide.md. 👍
ralfhandl
commented
Mar 6, 2025
There was a problem hiding this comment.
This file was removed on dev and changed on v3.1-dev. Removing it resolves the conflict.
11 tasks
handrews
approved these changes
Mar 13, 2025
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.
This PR reverts changes in branch
v3.1-devthat prevent updating it from main.Merging this PR will unblock the sync PR
This dummy PR from
devintov3.1-dev-resolve-conflictsproves thatdevcan be merged without conflicts into the commit history of this branch: