Commit 351390239673923d71610ba320b2bf163ab6f9a9
Exists in
master
and in
4 other branches
Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests
Fix failure of cheking a merge request after conflict.
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/gitlab/satellite/satellite.rb
| @@ -24,8 +24,8 @@ module Gitlab | @@ -24,8 +24,8 @@ module Gitlab | ||
| 24 | def clear_and_update! | 24 | def clear_and_update! |
| 25 | raise_no_satellite unless exists? | 25 | raise_no_satellite unless exists? |
| 26 | 26 | ||
| 27 | - delete_heads! | ||
| 28 | clear_working_dir! | 27 | clear_working_dir! |
| 28 | + delete_heads! | ||
| 29 | update_from_source! | 29 | update_from_source! |
| 30 | end | 30 | end |
| 31 | 31 |