cursorless-talon: Create PULL_REQUEST_TEMPLATE.md#2703
Merged
Conversation
pokey
approved these changes
Jan 7, 2025
cursorless-bot
pushed a commit
that referenced
this pull request
Jan 7, 2025
Hopefully prevent folks from sending PRs to <https://github.com/cursorless-dev/cursorless-talon>, which can then get merged and result in this mess: ```console > git pull --ff-only remote: Enumerating objects: 33, done. remote: Counting objects: 100% (30/30), done. remote: Compressing objects: 100% (11/11), done. remote: Total 33 (delta 21), reused 28 (delta 19), pack-reused 3 (from 1) Receiving objects: 100% (33/33), 10.82 KiB | 10.82 MiB/s, done. Resolving deltas: 100% (21/21), completed with 11 local objects. From https://github.com/cursorless-dev/cursorless-talon d8a602ee2d4b..b6e796b83d62 main -> origin/main hint: Diverging branches can't be fast-forwarded, you need to either: hint: hint: git merge --no-ff hint: hint: or: hint: hint: git rebase hint: hint: Disable this message with "git config advice.diverging false" fatal: Not possible to fast-forward, aborting. ```
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Hopefully prevent folks from sending PRs to https://github.com/cursorless-dev/cursorless-talon, which can then get merged and result in this mess: