pomutils
pomutils copied to clipboard
This library is for making the day easier while using git and maven. It solves the pain of merging pom's!
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`....
PropertyRule always overwrites with THEIR or OUR even if there is no conflict on the given property
If we have the scenario as follows: - Base {A = 1, B = 1} - BranchX {A = 2, B = 1} - BranchY {A = 1, B =...
First of all, thank you for this awesome project! We are using it for a quite a bit. It works flowerless with the exception of just one issue: If we...
Speficy --expandtab={count-of-space} to replace all indentation tabs with specified amount of spaces prior to the git merge. Note: this is just a subset of the git's -Xignore-all-space functionality. Misalignment after...