ralfth / pom-merge-driver Goto Github PK

The pom-merge-driver works great for the version aspects of the POM file. I am having the also conflict in the pom file. Does anyone have a work-around for this?

In some pom.xml, the tag is ended with an end of line character.
When merged by your git mergedriver, this end of line character is removed. Git detect the file is modified and add it to the commit merge.
Could you please change this mergedriver behavior?

Git repository to reproduce the issue: hello-world.zip

For projects which are not using UTF-8, is-it possible to detect pom.xml encoding from the XML header?

I used the version fixed with #2 and I've got the following error on some pom.xml:

  File "C:/git/mergepom.py", line 74, in <module>
    git_merge_res_str = git_merge_res.decode(enc)
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xe9 in position 1205: invalid continuation byte