[main] Bump Swashbuckle.AspNetCore from 6.6.2 to 6.7.1 in /eng/dependabot/independent

.github/workflows/sync-branches.yml

@@ -52,7 +52,7 @@ jobs:
           auth_token: ${{ secrets.GITHUB_TOKEN }}
 
   sync-code:
-    if: github.repository == 'dotnet/dotnet-monitor'
+    # if: github.repository == 'dotnet/dotnet-monitor'
     strategy:
       matrix:
         branch: ["feature/9.x"]
@@ -72,14 +72,26 @@ jobs:
 
       - name: Sync branch
         run: |
+          ourFiles=$(perl -ne '/^([^\s]+)\s+merge=ours/gm && print "$1 "' .gitattributes)
+
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           # Activate the ours merge driver to respect any branch specific files
           git config merge.ours.driver true
-          git merge "$base_branch" --strategy=ort --strategy-option=theirs
+          MERGE_RESULT=0
+          # Don't fail if the automatic merge fails, we'll try to handle it later
+          git merge "$base_branch" --strategy=ort --strategy-option=theirs || MERGE_RESULT=$?
+
+          # If the merge failed it's likely do a (modify/delete) conflict. Try to auto-resolve it by accepting the results
+          if [ $MERGE_RESULT -ne 0 ]; then
+              for match in $ourFiles; do
+                  git add -- "$match"
+              done
+              git commit --no-edit
+              #GIT_EDITOR=/bin/true git merge --continue
+          fi
 
-          matches=$(perl -ne '/^([^\s]+)\s+merge=ours/gm && print "$1 "' .gitattributes)
-          for match in $matches; do
+          for match in $ourFiles; do
               git checkout --no-overlay "$target_branch" -- "$match"
           done
         env:

eng/dependabot/independent/Versions.props

@@ -13,7 +13,7 @@
     <!-- Third-party references -->
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
     <NJsonSchemaVersion>11.0.0</NJsonSchemaVersion>
-    <SwashbuckleAspNetCoreVersion>6.6.2</SwashbuckleAspNetCoreVersion>
+    <SwashbuckleAspNetCoreVersion>6.7.1</SwashbuckleAspNetCoreVersion>
     <AwsSdkS3Version>3.7.305.7</AwsSdkS3Version>
     <AwsSdkSecurityTokenVersion>3.7.300.33</AwsSdkSecurityTokenVersion>