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.
Dmitriy Zaporozhets
2 parents d8ad01bb 77295b00
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
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
...	...	@@ -24,8 +24,8 @@ module Gitlab
24	24	def clear_and_update!
25	25	raise_no_satellite unless exists?
26	26
27		- delete_heads!
28	27	clear_working_dir!
	28	+ delete_heads!
29	29	update_from_source!
30	30	end
31	31
...	...