Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests

Fix failure of cheking a merge request after conflict.
2013-03-18 03:39:51 -07:00 · 2013-03-18 03:39:51 -07:00 · 3513902396
commit 3513902396
parent d8ad01bb6e 77295b00b8
1 changed files with 1 additions and 1 deletions
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
@ -24,8 +24,8 @@ module Gitlab
      def clear_and_update!
        raise_no_satellite unless exists?

-        delete_heads!
        clear_working_dir!
+        delete_heads!
        update_from_source!
      end