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

Class Merge

java.lang.Object

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

public class Merge
extends Object

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 for a simple fast forward merge, otherwise it will create a merge commit. It returns the list of commits involved in the merge operation.

Constructor Summary

Constructors

Constructor	Description
Merge(Git git, String sourceBranch, String targetBranch)
Merge(Git git, String sourceBranch, String targetBranch, boolean noFastForward, boolean squash, CommitInfo commitInfo)

Method Summary

Modifier and Type	Method	Description
List<String>	execute()

Methods inherited from class java.lang.Object

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

Constructor Detail

Merge

public Merge(Git git,
             String sourceBranch,
             String targetBranch)

Merge

public Merge(Git git,
             String sourceBranch,
             String targetBranch,
             boolean noFastForward,
             boolean squash,
             CommitInfo commitInfo)

Method Detail

execute

public List<String> execute()