[jbossts-issues] [JBoss JIRA] (JBTM-1281) Improve Narayana.sh to auto-merge when pulling upstream AS changes
[
https://issues.jboss.org/browse/JBTM-1281?page=com.atlassian.jira.plugin....
]
Paul Robinson commented on JBTM-1281:
-------------------------------------
We might need to wait until this conflict happens again and then try out different ways of
auto-resolving with 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
Priority: Minor
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