Sven Oppermann
Sven Oppermann
Both of your scenarios are working as intended. With the PropertyRule you define properties which should not be merged in the "usual" git way. You define it as that "our"/"their"...
This would be a new feature. Want you want is: > if there is no conflict do a normal merge, if there is a conflict use the OURS/THEIRS value. Due...
Hi, i had a quick look and it is not that easy. We only adjust the pom version value element, regardless of the position on the line. Example: branch1: `1.0`...
The problem on your first solution is, that would happen for all poms. So if you have a multi module project with 100 of poms that could take a while,...
If there is no solution on your side (get a xml formatter for every developer so the pom.xml file is always correct formatted), then the way i would go would...
so you changed your developers format rules and the problem does not exist anymore? So we can close this issue?
Ok, than send me a pull request and i will have a look. Plz add a test too. Have a look at my other tests, its easy to add them.
@borisbrodski are you working on it anymore? Or can i close this ticket?
Hi Boris, i had a look. What do you think, if i would change it to "Tabify" and "Untabify"? So we can get both worlds? The one who uses TABs...