Added merge Srategy

dchristl · May 3, 2024 · a33bbcc · a33bbcc
1 parent 59a82df
commit a33bbcc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/endpoint/updateRepo b/endpoint/updateRepo
@@ -5,4 +5,4 @@ cd "$curr_dir" || exit
 cd ..
 date > /tmp/last_update.log
 git pull origin "$(git branch --show-current)" >> /tmp/last_update.log
-git merge origin/"$(git branch --show-current)" >> /tmp/last_update.log
+git merge origin/"$(git branch --show-current)" --strategy-option=theirs >> /tmp/last_update.log