Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests

Fix failure of cheking a merge request after conflict.

Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests
Fix failure of cheking a merge request after conflict.
35139023 · Dmitriy Zaporozhets · d8ad01bb · 77295b00 · 35139023
Commit 35139023 authored Mar 18, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/satellite/satellite.rb lib/gitlab/satellite/satellite.rb +1 -1

No files found.
--- 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