If the merge fails, you might see the following message in the console (accumulated strategy):
The first line comes from our plugin, and second one comes from git and is the reason why the merge fails.
This isn't obvious.
|Field||Original Value||New Value|
|Summary||Improve log output if git merge fails||Improve log output if git merge fails (Praqma case 12876)|
|Resolution||Fixed [ 1 ]|
|Status||Open [ 1 ]||Resolved [ 5 ]|
|Assignee||Praqma Support [ praqma ]||Bue Petersen [ bue ]|
|Status||Resolved [ 5 ]||Closed [ 6 ]|
R. Tyler Croy made changes -
|Workflow||JNJira [ 161938 ]||JNJira + In-Review [ 208590 ]|