org.uberfire.java.nio.fs.jgit.util.commands

Class Merge

java.lang.Object

org.uberfire.java.nio.fs.jgit.util.commands.GitCommand

org.uberfire.java.nio.fs.jgit.util.commands.Merge

public class Merge
extends GitCommand

Implements Git Merge command between branches in a bare repository. Branches needs to be part of the same repository, you cannot merge branches from different repositories (or forks). This command is based on Git Cherry Pick command. It returns the list of commits cherry picked.

Constructor Summary

Constructors

Constructor and Description
Merge(org.eclipse.jgit.api.Git git, String sourceBranch, String targetBranch)

Method Summary

Modifier and Type	Method and Description
Optional<List<String>>	execute() This method has to be implemented by subclasses to execute the git command.

Methods inherited from class org.uberfire.java.nio.fs.jgit.util.commands.GitCommand

getRevCommit, getRevTree, getStartCommit, isBare

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

Merge

public Merge(org.eclipse.jgit.api.Git git,
             String sourceBranch,
             String targetBranch)

Method Detail

execute

public Optional<List<String>> execute()

Description copied from class: GitCommand

This method has to be implemented by subclasses to execute the git command. Remember that if you want to apply parameters you have to do it in your own constructor.

Specified by:

execute in class GitCommand

Returns:

a value that may be the returning object or empty.