try fix sync with upstream overriding local changes

data/FilterList.json

@@ -1,7 +1,7 @@
 [
   {
     "id": 1,
-    "description": "A filter list that blocks mobile advertisements and trackers on Japanese properties",
+    "description": "TEMP A filter list that blocks mobile advertisements and trackers on Japanese properties",
     "homeUrl": "https://280blocker.net",
     "licenseId": 1,
     "name": "280 Blocker",

server/azure-pipelines.migrate.yaml

@@ -80,20 +80,20 @@ steps:
         fi
 
   - task: Bash@3
-    displayName: rebase upstream/master
+    displayName: sync with upstream
     inputs:
       targetType: inline
       script: |
         git remote add upstream https://github.com/collinbarrett/FilterLists.git
         git fetch upstream
-        git checkout upstream/master 'data/*.json' 'server/src/FilterLists.Data.Migrations/*'
+        git merge upstream/master
         CONFLICTS=$(git ls-files -u | wc -l)
         if [ "$CONFLICTS" -gt 0 ] ; then
-          echo "Data changes conflict with upstream master. Aborting..."
+          echo "Conflicts with upstream repository. Aborting..."
           exit 1
         fi
         if [[ $(git status -uno --porcelain) ]] ; then
-          git commit -m "merge upstream data"
+          git commit -m "sync with upstream"
         fi
 
   - task: CmdLine@2