public class MergeMessageFormatter
extends java.lang.Object
The format should be the same as C Git does it, for compatibility.
Constructor and Description |
---|
MergeMessageFormatter() |
Modifier and Type | Method and Description |
---|---|
java.lang.String |
format(java.util.List<Ref> refsToMerge,
Ref target)
Construct the merge commit message.
|
java.lang.String |
formatWithConflicts(java.lang.String message,
java.util.List<java.lang.String> conflictingPaths)
Add section with conflicting paths to merge message.
|
public java.lang.String format(java.util.List<Ref> refsToMerge, Ref target)
refsToMerge
- the refs which will be mergedtarget
- the branch ref which will be merged intopublic java.lang.String formatWithConflicts(java.lang.String message, java.util.List<java.lang.String> conflictingPaths)
message
- the original merge messageconflictingPaths
- the paths with conflictsCopyright © 2012. All Rights Reserved.