[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 edited comment on JBTM-1281 at 10/12/12 10:36 AM: ---------------------------------------------------------------- We might need to wait until this conflict happens again and then try out different ways of auto-resolving with git 1.7.1. I suggest we push to the next release. was (Author: paul.robinson): We might need to wait until this conflict happens again and then try out different ways of auto-resolving with 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