Class: Git::Commands::Merge::Continue Private

Inherits:

Base

• Object
• Base
• Git::Commands::Merge::Continue

Defined in:

lib/git/commands/merge/continue.rb

Overview

This class is part of a private API. You should avoid using this class if possible, as it may be removed or be changed in the future.

Note:

arguments block audited against https://git-scm.com/docs/git-merge/2.53.0

Implements git merge --continue to complete a merge after conflict resolution

After the user has resolved conflicts and staged the changes, the merge can be concluded with this command.

Examples:

Continue after resolving conflicts

continue_cmd = Git::Commands::Merge::Continue.new(execution_context)
continue_cmd.call

See Also:

• Git::Commands::Merge
• git-merge

Instance Method Summary

• #call ⇒ Git::CommandLineResult

  Resume the in-progress merge after conflicts have been resolved.

Methods inherited from Base

allow_exit_status, arguments, #initialize, requires_git_version, skip_version_validation

Constructor Details

This class inherits a constructor from Git::Commands::Base

Instance Method Details

#call ⇒ Git::CommandLineResult

Resume the in-progress merge after conflicts have been resolved

Returns:

• (Git::CommandLineResult) —

  the result of calling git merge --continue

Raises:

• (Git::FailedError) —

  if git exits with a non-zero exit status

# File 'lib/git/commands/merge/continue.rb', line 31