Commit 35139023 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests

Fix failure of cheking a merge request after conflict.
parents d8ad01bb 77295b00
...@@ -24,8 +24,8 @@ module Gitlab ...@@ -24,8 +24,8 @@ module Gitlab
def clear_and_update! def clear_and_update!
raise_no_satellite unless exists? raise_no_satellite unless exists?
delete_heads!
clear_working_dir! clear_working_dir!
delete_heads!
update_from_source! update_from_source!
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment