Status: Resolved (View Workflow)
The svnmerge plugin is currently under development and it would be nice if for feature branches it integrated changes from upstream before building.
The build should fail if there are any conflicts.
- depends on
JENKINS-22850 More control on Automatic Rebase feature
Code changed in jenkins
User: Hugues Chabot
Merge pull request #12 from vernyquartara/
[FIXED JENKINS-22850] [FIXED JENKINS-6851] Added option on "Automatic Rebase" action to fail the build when merge conflicts are found.