File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -107,11 +107,11 @@ then run the `git merge-file` command (which is used by the default merge driver
107107*merge* Command *ADVANCED* Usage
108108------------
109109
110- It is also possible to write your own *Rule* for conflict resolution. Currently there are two
111- implemented rules:
110+ It is also possible to write your own *Rule* for conflict resolution. Currently there are three implemented rules:
112111
113112 - de.oppermann.pomutils.rules.ProjectAndParentVersionRule
114113 - de.oppermann.pomutils.rules.PropertyRule
114+ - de.oppermann.pomutils.rules.ScmTagRule
115115
116116If you don't specify `--ruleset` on command line the *de.oppermann.pomutils.rules.ProjectAndParentVersionRule*
117117rule is used. But if you want e.g. to resolve conflicts on maven properties too, or want
@@ -127,6 +127,10 @@ to evaluate your own rule, you have to create a ruleset configuration file. This
127127 - foobar.version
128128 propertiesRegex: # resolves properties in the global and profile property section matching regex expression, using the *OUR* strategy
129129 - .+\.version
130+
131+ --- !!de.oppermann.pomutils.rules.ScmTagRule
132+ strategy: OUR # possible values: OUR|THEIR
133+ # resolves the <scm><tag>...</tag></scm> element conflicts, using the *OUR* strategy
130134
131135Basically you define the rules which should be used by adding the implementation class of the rule with *--- !!*,
132136followed by the configuration. If you want to write your own rule, have a look at the implemented ones and perhaps send
You can’t perform that action at this time.
0 commit comments