Keep server side Specs when pull

2026-01-12 17:12:54 +08:00 · 2013-02-13 01:16:03 +08:00
parent 49eafba940
commit 2819d6f5eb
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -86,7 +86,7 @@ namespace :gem do
    end

    # Ensure that the branches are up to date with the remote
-    sh "git pull"
+    sh "git pull -s recursive -X theirs"

    puts "* Running specs"
    silent_sh('rake spec:all')