[JIRA] [pretested-integration-plugin] (JENKINS-28640) Quotationmarks in commit message leads to merge failure (Praqma case 13083)

[meol...@atmel.com (JIRA)]

Title: Message Title

Morten Engelhardt Olsen commented on JENKINS-28640   Re: Quotationmarks in commit message leads to merge failure (Praqma case 13083) Attaching log [PREINT] Preparing environment using Pretested Integration Plugin 2.3.0-SNAPSHOT (cbd24) [PREINT] Checking out integration branch master: [PREINT] D:\Jenkins_MCU_Node\tools\git\bin\git checkout -B master atmelstudio/master [atmelstudio] $ D:\Jenkins_MCU_Node\tools\git\bin\git checkout -B master atmelstudio/master [PREINT] D:\Jenkins_MCU_Node\tools\git\bin\git pull atmelstudio master [atmelstudio] $ D:\Jenkins_MCU_Node\tools\git\bin\git pull atmelstudio master [PREINT] Preparing to merge changes in commit fe50e64d497d722c41fe63f984dd1cf4702c3af5 on development branch atmelstudio/bugfix/ready_AVRSV-6716 to integration branch master [PREINT] Collecting commit messages on development branch atmelstudio/bugfix/ready_AVRSV-6716 [PREINT] Done collecting commit messages [PREINT] Collecting author of last commit on development branch [PREINT] Done colecting last commit author: <@> 1436164197 +0530 [PREINT] Starting accumulated merge (no-ff) - without commit: [PREINT] D:\Jenkins_MCU_Node\tools\git\bin\git merge -m "Accumulated commit of the following from branch 'atmelstudio/bugfix/ready_AVRSV-6716': commit fe50e64d497d722c41fe63f984dd1cf4702c3af5 Author: Date: Mon Jul 6 07:29:57 2015 +0100 Fixed isues AVRSV-6716 commit 633f1a4b795f46a4fcb6e4910612bcc8c8325b50 Author: Date: Mon Jul 6 07:10:21 2015 +0100 AVRSV-6716 "program flash from RAM" option is disable under tools options in properties window and Memories tab in Device programming dialog " fe50e64d497d722c41fe63f984dd1cf4702c3af5 --no-ff --no-commit [atmelstudio] $ D:\Jenkins_MCU_Node\tools\git\bin\git merge -m 'Accumulated commit of the following from branch 'atmelstudio/bugfix/ready_AVRSV-6716': commit fe50e64d497d722c41fe63f984dd1cf4702c3af5 Author: Date: Mon Jul 6 07:29:57 2015 +0100 Fixed isuues AVRSV-6716 commit 633f1a4b795f46a4fcb6e4910612bcc8c8325b50 Author: Date: Mon Jul 6 07:10:21 2015 +0100 AVRSV-6716 "program flash from RAM" option is disable under tools options in properties window and Memories tab in Device programming dialog ' fe50e64d497d722c41fe63f984dd1cf4702c3af5 --no-ff --no-commit [PREINT] Accumulated merge done [PREINT] Failed to merge. [PREINT] Git command failed with exit code '1' and error message: merge: flash - not something we can merge Could not merge changes. Git output: merge: flash - not something we can merge (anonymized) Add Comment   This message was sent by Atlassian JIRA (v6.4.2#64017-sha1:e244265) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.