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.
kutzi made changes -
|Field||Original Value||New Value|
|Component/s||svnmerge [ 15739 ]|
|Component/s||other [ 15490 ]|
Hugues Chabot made changes -
|Resolution||Fixed [ 1 ]|
|Status||Open [ 1 ]||Resolved [ 5 ]|
R. Tyler Croy made changes -
|Workflow||JNJira [ 136946 ]||JNJira + In-Review [ 187323 ]|