Switch items 2 and 3 in the README: You can't resolve a nonexistent merge conflict #42
Conversation
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
|
@heiskr would you mind reviewing/merging this please? |
pierrekh
reviewed
Jan 22, 2025
|
In this course, @github-actions[bot] will make a commit so that creating a PR (formerly created automatically cf. #13) can result in a merge conflict. |
|
8 |
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.
Summary
You can't resolve a nonexistent merge conflict.
Changes
Closes: Small enough change that I didn't open an issue
Switches items #2 and #3 in the README: you can't resolve a nonexistent merge conflict.
Task list
For workflow changes, I have verified the Actions workflows function as expected.For content changes, I have reviewed the style guide.