Remove inappropriate merge strategy and try again with default strate…

…gy (ProteoWizard#1673)

Remove inappropriate merge strategy and try again with default strategy
Switch from triggering on push to master to triggering on issue comment
Add more path exclusions for build_and_test.yml

.github/workflows/build_and_test.yml

@@ -15,6 +15,10 @@ on:
     - 'pwiz_tools/Shared/**'
     - 'pwiz_tools/Skyline/**'
     - 'pwiz_tools/Topograph/**'
+    - 'scripts/Topograph/**'
+    - 'doc/**'
+    - 'clean.*'
+    - '.github/workflows/cherrypick-to-release.yml'
   pull_request:
     branches: [ master ]
     paths-ignore:
@@ -24,6 +28,9 @@ on:
     - 'pwiz_tools/Shared/**'
     - 'pwiz_tools/Skyline/**'
     - 'pwiz_tools/Topograph/**'
+    - 'doc/**'
+    - 'clean.*'
+    - '.github/workflows/cherrypick-to-release.yml'
 
 # There is a single job here called "build" (The word "build" is NOT a keyword, you can use anything there)
 jobs:

.github/workflows/cherrypick-to-release.yml

@@ -1,8 +1,12 @@
 name: Cherry-pick from master to Skyline release branch
 on:
-  push:
-    branches:
-      - master
+  #push:
+  #  branches:
+  #    - master
+  issue_comment:
+    types:
+      - created
+      - edited
 jobs:
   release_pull_request:
     runs-on: ubuntu-latest
@@ -15,7 +19,7 @@ jobs:
       with:
         pr_branch: 'Skyline/skyline_21_1'
         opt_in_message: '[cp-to-release]'
-        merge_strategy: '--strategy=recursive -Xtheirs'
+        #merge_strategy: '--strategy=recursive -Xtheirs'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITBOT_EMAIL: [email protected]