Update PoB 2 backport

Now tries to do a 3way merge if possible and falls back to reject when failing
Also adds the PR # to the run name

Author: LocalIdentity

.github/workflows/backport_receive.yml

@@ -1,5 +1,5 @@
 name: Update code with code from PoB2
-run-name: ${{ github.event.client_payload.title }}
+run-name: "PR #${{ github.event.client_payload.id }} — ${{ github.event.client_payload.title }}"
 
 on:
     repository_dispatch:
@@ -15,17 +15,22 @@ jobs:
               with:
                 ref: 'dev'
             - name: Apply patch
-              continue-on-error: true
               run: |
-                curl -L ${{ github.event.client_payload.patch_url }} | patch -p1 --merge --verbose -f -l --no-backup-if-mismatch
+                # Download patch first to avoid broken pipes if apply exits early
+                PATCH_FILE=$(mktemp)
+                curl -L ${{ github.event.client_payload.patch_url }} -o "$PATCH_FILE"
+                if ! git apply -v --3way --ignore-whitespace --index "$PATCH_FILE"; then
+                  echo "3-way apply failed, retrying with --reject"
+                  git apply -v --reject --ignore-whitespace --index "$PATCH_FILE" || true
+                fi
             - name: Create Pull Request
               uses: peter-evans/create-pull-request@v5
               with:
                 title: "[pob2-port] ${{ github.event.client_payload.title }}"
                 branch: pob2-pr-${{ github.event.client_payload.id }}
                 body: |
                   ${{ github.event.client_payload.msg }}
-                committer: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
                 author: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
+                committer: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
                 commit-message: ${{ github.event.client_payload.msg }}
-                labels: ${{ github.event.client_payload.labels }}
+                labels: ${{ github.event.client_payload.labels }}