merging changes from a maven release branch yields conflicts due to changed versions in poms
- 阅读更多 关于 merging changes from a maven release branch yields conflicts due to changed versions in poms
问题 following standard practice, I have an svn trunk for feature development, and a forked-off branch for building releases. The branch has been created using the maven release plugin, which is also used for creating releases. As it happens, the occasional bug will be fixed on the branch, and those changes need to be merged back into the trunk. To not miss any changes, I'd like to be able to simply merge the complete branch back into the trunk. Now my problem is that I get numerous conflicts in