Skip to content

Conversation

auscompgeek
Copy link
Member

Hopefully prevent folks from sending PRs to https://github.com/cursorless-dev/cursorless-talon, which can then get merged and result in this mess:

> 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.

@auscompgeek auscompgeek requested a review from a team as a code owner December 28, 2024 15:00
@pokey pokey added this pull request to the merge queue Jan 7, 2025
Merged via the queue into main with commit 67c3c5d Jan 7, 2025
15 checks passed
@pokey pokey deleted the talon-pr-template-to-monorepo branch January 7, 2025 14:38
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.
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants