deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests

Browse source 
Fix failure of cheking a merge request after conflict.
This commit is contained in:
Dmitriy Zaporozhets 2013-03-18 03:39:51 -07:00
commit 3513902396
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab/satellite/satellite.rb
View file

@ -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