ralfth / pom-merge-driver Goto Github PK
View Code? Open in Web Editor NEWA Git merge driver for Maven's pom.xml.
License: GNU General Public License v2.0
A Git merge driver for Maven's pom.xml.
License: GNU General Public License v2.0
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
A declarative, efficient, and flexible JavaScript library for building user interfaces.
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. ๐๐๐
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google โค๏ธ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.