@Operation('merge') class MergeOp extends java.lang.Object
Merges changes from a single head. This is a simplified version of
merge. If any conflict occurs the merge will throw an exception. The
conflicting files can be identified with grgit.status().
Merge another head into the current branch.
grgit.merge(head: 'some-branch')
Merge with another mode.
grgit.merge(mode: MergeOp.Mode.ONLY_FF)See git-merge Manual Page.
| Modifiers | Name | Description |
|---|---|---|
static enum |
MergeOp.Mode |
| Type | Name and description |
|---|---|
java.lang.Object |
headThe head to merge into the current HEAD. |
java.lang.String |
messageThe message to use for the merge commit |
MergeOp.Mode |
modeHow to handle the merge. |
| Constructor and description |
|---|
MergeOp
(Repository repo) |
| Methods inherited from class | Name |
|---|---|
class java.lang.Object |
java.lang.Object#wait(long, int), java.lang.Object#wait(long), java.lang.Object#wait(), java.lang.Object#equals(java.lang.Object), java.lang.Object#toString(), java.lang.Object#hashCode(), java.lang.Object#getClass(), java.lang.Object#notify(), java.lang.Object#notifyAll() |
The head to merge into the current HEAD.
The message to use for the merge commit
How to handle the merge.
Groovy Documentation