src/Robo/Commands/Deploy/DeployCommand.php
protected function mergeUpstreamChanges() {
    $git_remotes = $this->getConfigValue('git.remotes');
    $remote_url = reset($git_remotes);
    $remote_name = md5($remote_url);

    $this->say("Merging upstream changes into local artifact...");
    $this->taskExecStack()
      ->dir($this->deployDir)
      // This branch may not exist upstream, so we do not fail the build if a
      // merge fails.
      ->stopOnFail(FALSE)
      ->exec("git fetch $remote_name {$this->branchName} --depth=1")
      ->exec("git merge $remote_name/{$this->branchName}")
      ->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
      ->run();
  }
protected function mergeUpstreamChanges() {
    $git_remotes = $this->getConfigValue('git.remotes');
    $remote_url = reset($git_remotes);
    $remote_name = md5($remote_url);

    $this->say("Merging upstream changes into local artifact...");
    $this->taskExecStack()
      ->dir($this->deployDir)
      // This branch may not exist upstream, so we do not fail the build if a
      // merge fails.
      ->stopOnFail(FALSE)
      ->exec("git fetch $remote_name {$this->branchName} --depth=1")
      ->exec("git merge $remote_name/{$this->branchName}")
      ->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
      ->run();
  }
protected function mergeUpstreamChanges ( ) { $ git_remotes = $ this -> getConfigValue ( 'git.remotes' ) ; $ remote_url = reset ( $ git_remotes ) ; $ remote_name = md5 ( $ remote_url ) ; $ this -> say ( "Merging upstream changes into local artifact..." ) ; $ this -> taskExecStack ( ) -> dir ( $ this -> deployDir ) // This branch may not exist upstream, so we do not fail the build if a // merge fails. -> stopOnFail ( FALSE ) -> exec ( "git fetch $remote_name {$this->branchName} --depth=1" ) -> exec ( "git merge $remote_name/{$this->branchName}" ) -> setVerbosityThreshold ( VerbosityThresholdInterface :: VERBOSITY_VERBOSE ) -> run ( ) ; }
Merges upstream changes into deploy branch.
Merges upstream changes into deploy branch .