[jbossts-issues] [JBoss JIRA] (JBTM-1527) scripts/rebase-jbossas-branch.sh pushes empty 'A' and 'M' files when merging
Paul Robinson (JIRA)
jira-events at lists.jboss.org
Mon Mar 11 04:52:41 EDT 2013
Paul Robinson created JBTM-1527:
Summary: scripts/rebase-jbossas-branch.sh pushes empty 'A' and 'M' files when merging
Project: JBoss Transaction Manager
Issue Type: Bug
Security Level: Public (Everyone can see)
Components: Build System
Reporter: Paul Robinson
Assignee: Paul Robinson
Fix For: 5.0.0.M3
The portion of the scrip that resolves merge conflicts seems to be thinking the 'A' and 'M' attributes of the 'git status' output are files and manages to add them.
I think we can only debug this issue when there's a merge conflict.
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