[jbossts-issues] [JBoss JIRA] (JBTM-1288) narayana.sh doesn't tollerate situation where existing JBossAS clone is on 'no branch'
Paul Robinson (JIRA)
jira-events at lists.jboss.org
Fri Oct 5 07:05:03 EDT 2012
Paul Robinson created JBTM-1288:
Summary: narayana.sh doesn't tollerate situation where existing JBossAS clone is on 'no branch'
Project: JBoss Transaction Manager
Issue Type: Bug
Security Level: Public (Everyone can see)
Reporter: Paul Robinson
Assignee: Paul Robinson
Fix For: 4.17.1, 5.0.0.M2
If the previous run needed to resolve a conflict, the branch will be left in a state where the rebase was not completed and thus on "no branch".
I think the safest thing to do would be to attempt to "git rebase --abort" before calling "checkout 5_BRANCH".
Alternatively, we could finish the rebase, by, doing a "git add" of the change and then a "git rebase --continue", but this may be harder to get right.
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
More information about the jbossts-issues