Skip to content

Commit

Permalink
update README
Browse files Browse the repository at this point in the history
  • Loading branch information
ralfth committed Mar 24, 2015
1 parent 87ee53b commit 862f803
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@ pom-merge-driver

Custom Git merge driver for Maven's pom.xml.

If there was a change in the project version in a
branch to be merged (while this change was not merged
yet), use their version to avoid conflicts and be
consistent in case of trivial merges that might happen
at the same time. All other changes in the file will
be merged as usual.

Before committing however, the project version is reverted
back to its previous value, unless on master branch.
This allows for gitflow release-finish, hotfix-finish,
and feature-finish to work better.
If there is a conflict in the project version
of the branch to be merged, the conflict will
automatically be resolved by keeping our version except
for master branch to allow gitflow's release-finish,
hotfix-finish and feature-finish work better. Other
changes in the file will be merged as usual.

If Git configuration variable "merge.pommerge.keepmasterversion"
is set to true, the project version is always reverted
is set to true, the project version will always be kept
even on master branch.

Installation
Expand Down

0 comments on commit 862f803

Please sign in to comment.