[ https://issues.jboss.org/browse/JBTM-1281?page=com.atlassian.jira.plugin.... ] Paul Robinson commented on JBTM-1281: ------------------------------------- Pull requests in: https://github.com/jbosstm/narayana/pull/114 https://github.com/jbosstm/narayana/pull/113 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBTM-1281?page=com.atlassian.jira.plugin.... ] Paul Robinson updated JBTM-1281: -------------------------------- Status: Resolved (was: Pull Request Sent) Resolution: Done -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBTM-1281?page=com.atlassian.jira.plugin.... ] Paul Robinson updated JBTM-1281: -------------------------------- Git Pull Request: https://github.com/jbosstm/narayana/pull/114, https://github.com/jbosstm/narayana/pull/113 (was: https://github.com/jbosstm/narayana/pull/114, https://github.com/jbosstm/narayana/pull/113) Priority: Minor (was: Major) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBTM-1281?page=com.atlassian.jira.plugin.... ] Paul Robinson edited comment on JBTM-1281 at 10/12/12 10:24 AM: ---------------------------------------------------------------- Re-opening as the current fix is git 1.7.3 onwards only: {code} git pull --rebase --ff-only -s recursive -Xours upstream master {code} "git rebase --strategy <s>" learned "-X" option to pass extra options that are understood by the chosen merge strategy. half the Linux CI nodes are still running git 1.7.1 and can't be upgraded due to this being the highest version that the latest CentOS supports. We could compile it ourselves if we really wanted to. was (Author: paul.robinson): Re-opening as the current fix is git 1.7.3 onwards only: {code} git pull --rebase --ff-only -s recursive -Xours upstream master {code} "git rebase --strategy <s>" learned "-X" option to pass extra options that are understood by the chosen merge strategy. half the Linux CI nodes are still running git 1.7.1. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBTM-1281?page=com.atlassian.jira.plugin.... ] Tom Jenkinson reassigned JBTM-1281: ----------------------------------- Assignee: Tom Jenkinson (was: Paul Robinson) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBTM-1281?page=com.atlassian.jira.plugin.... ] Tom Jenkinson updated JBTM-1281: -------------------------------- Status: Resolved (was: Pull Request Sent) Resolution: Done -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira