[jbossts-issues] [JBoss JIRA] (JBTM-1281) Improve Narayana.sh to auto-merge when pulling upstream AS changes

[Paul Robinson (JIRA)]

     [ https://issues.jboss.org/browse/JBTM-1281?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Paul Robinson reopened JBTM-1281:
---------------------------------



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}

>From Git v1.7.3 Release Notes:

"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.

                
> Improve Narayana.sh to auto-merge when pulling upstream AS changes
> ------------------------------------------------------------------
>
>                 Key: JBTM-1281
>                 URL: https://issues.jboss.org/browse/JBTM-1281
>             Project: JBoss Transaction Manager
>          Issue Type: Task
>      Security Level: Public(Everyone can see) 
>          Components: Build System
>            Reporter: Paul Robinson
>            Assignee: Paul Robinson
>             Fix For: 4.17.1, 5.0.0.M2
>
>


--
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