[jbossts-issues] [JBoss JIRA] (JBTM-1527) scripts/rebase-jbossas-branch.sh pushes empty 'A' and 'M' files when merging

scripts/rebase-jbossas-branch.sh pushes empty 'A' and 'M' files when merging ---------------------------------------------------------------------------- Key: JBTM-1527 URL: https://issues.jboss.org/browse/JBTM-1527 Project: JBoss Transaction Manager Issue Type: Bug Security Level: Public(Everyone can see) Components: Build System Reporter: Paul Robinson Assignee: Paul Robinson Priority: Minor Fix For: 5.0.0.Final Original Estimate: 1 hour Remaining Estimate: 1 hour 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.