ACM/Grafana: forcefully use upstream files

.github/workflows/merge-acm-flow.yaml

@@ -151,7 +151,8 @@ jobs:
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' && inputs.restore-upstream != ''}}
         run: |
           echo "reset ${{ inputs.restore-upstream }}"
-          git checkout --theirs ${{ inputs.restore-upstream }} || true
+          git reset ${{ steps.upstream.outputs.release }} -- ${{ inputs.restore-upstream }} || true
+          git clean -f -d || true
           git add ${{ inputs.restore-upstream }} || true
       - name: Remove deleted files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}

.github/workflows/merge-acm-grafana.yaml

@@ -27,19 +27,26 @@ jobs:
       restore-upstream: >-
         .betterer.results
         .drone.yml
+        apps
         CHANGELOG.md
+        devenv
+        Dockerfile
         docs
+        e2e
+        hack
         go.mod
         go.sum
         go.work
         go.work.sum
+        Makefile
         pkg
         scripts
         lerna.json
         package.json
         packages
         public/
         yarn.lock
+        .yarn
         SECURITY.md
         .bingo/
       assets-cmd: |