fix: auto-resolve merge conflicts with upstream version

Author: buithehien1991

.github/workflows/translate-digest.yml

@@ -31,11 +31,21 @@ jobs:
           git remote add upstream https://github.com/duanyytop/agents-radar.git || true
           git fetch upstream master
           LOCAL=$(git rev-parse HEAD)
-          git merge upstream/master --no-edit --allow-unrelated-histories || true
+          git merge upstream/master --no-edit --allow-unrelated-histories || {
+            echo "Merge conflict detected — auto-resolving with upstream version..."
+            git checkout --theirs .
+            git add -A
+            git commit --no-edit
+          }
           AFTER=$(git rev-parse HEAD)
           if [ "$LOCAL" != "$AFTER" ]; then
             echo "Upstream merged — pushing..."
-            git pull --rebase origin master
+            git pull --rebase origin master || {
+              echo "Rebase conflict — resolving with upstream..."
+              git checkout --theirs .
+              git add -A
+              git rebase --continue
+            }
             git push
           else
             echo "Already up to date with upstream."