Groovy Documentation

org.ajoberstar.gradle.git.tasks
[Java] Class GitMerge

java.lang.Object
  org.gradle.api.DefaultTask
      org.ajoberstar.gradle.git.tasks.GitBase
          org.ajoberstar.gradle.git.tasks.GitMerge

public class GitMerge
extends GitBase

Task to join two or more development histories together.

Authors:
Alex Lixandru
Since:
0.2.1


Method Summary
java.lang.String getRef()

Gets the ref that will be merges with the current branch.

java.lang.Object getStrategy()

Gets the merge strategy.

void merge()

Merges some changes with the current branch.

void setRef(java.lang.Object ref)

Sets the ref that will be merged with the current branch.

void setStrategy(java.lang.Object mode)

Sets the merge strategy

 
Methods inherited from class GitBase
getGit, getRepoDir, setRepoPath
 

Method Detail

getRef

public
public java.lang.String getRef()
Gets the ref that will be merges with the current branch.
Returns:
the ref which will be merged with the current branch


getStrategy

@Option
al
	public
public java.lang.Object getStrategy()
Gets the merge strategy.
Returns:
the merge strategy; either resolve, ours, theirs or simple_two_way_in_core


merge

tion
	public
public void merge()
Merges some changes with the current branch.


setRef

public void setRef(java.lang.Object ref)
Sets the ref that will be merged with the current branch.
Parameters:
ref - the ref that will be merged


setStrategy

public void setStrategy(java.lang.Object mode)
Sets the merge strategy
Parameters:
mode - the merge strategy. Must be one of the following values:
  • resolve
  • ours
  • theirs
  • simple_two_way_in_core


 

Groovy Documentation