feat: added more stubborn merge strategy for the aur master

1 files changed, 1 insertions, 1 deletions

diff --git a/justfile b/justfile
index 358985177dda..beed114af1b4 100644
--- a/justfile
+++ b/justfile
@@ -67,7 +67,7 @@ publish: prepare
     @echo -e "\e[36mSwitching to aur master branch...\e[0m"
     @git checkout master
     @echo -e "\e[36mMerging main into aur master...\e[0m"
-    @git merge main
+    @git merge -X theirs main
     @echo -e "\e[36mPushing to aur...\e[0m"
     @git push aur master
     @echo -e "\e[36mSwitching back to main...\e[0m"