lib/gitlab/satellite/merge_action.rb
def merge_in_satellite!(repo, message = nil)
        update_satellite_source_and_target!(repo)

        message ||= "Merge branch '#{merge_request.source_branch}' into '#{merge_request.target_branch}'"

        # merge the source branch into the satellite
        # will raise CommandFailed when merge fails
        repo.git.merge(default_options({no_ff: true}), "-m #{message}", "source/#{merge_request.source_branch}")
      rescue Grit::Git::CommandFailed => ex
        handle_exception(ex)
      end
# Merges the source_branch into the target_branch in the satellite.
#
# Note: it will clear out the satellite before doing anything
#
# Returns false if the merge produced conflicts
# Returns true otherwise
Merges the source_branch into the target_branch in the satellite.
Note: it will clear out the satellite before doing anything

Returns false if the merge produced conflicts
Returns true otherwise
Merges the source_branch into the target_branch in the satellite . Note : it will clear out the satellite before doing anything Returns false if the merge produced conflicts Returns true otherwise
def merge_in_satellite!(repo, message = nil)
        update_satellite_source_and_target!(repo)
        message ||= "Merge branch '#{merge_request.source_branch}' into '#{merge_request.target_branch}'"
        repo.git.merge(default_options({no_ff: true}), "-m #{message}", "source/#{merge_request.source_branch}")
      rescue Grit::Git::CommandFailed => ex
        handle_exception(ex)
      end
def merge_in_satellite! ( repo , message = nil ) update_satellite_source_and_target! ( repo ) message ||= "Merge branch '#{merge_request.source_branch}' into '#{merge_request.target_branch}'" repo . git . merge ( default_options ( { no_ff : true } ) , "-m #{message}" , "source/#{merge_request.source_branch}" ) rescue Grit :: Git :: CommandFailed => ex handle_exception ( ex ) end
Merges the source_branch into the target_branch in the satellite.
Merges the source_branch into the target_branch in the satellite .
# merge the source branch into the satellite # will raise CommandFailed when merge fails
repo
message