Skip to content
Snippets Groups Projects
Commit 77295b00 authored by murank's avatar murank
Browse files

Fix the order of clearing a satellite

parent a96e0ec5
No related branches found
No related tags found
1 merge request!3242Fix failure of cheking a merge request after conflict.
Loading
Loading
@@ -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
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment