scripts/rebase-jbossas-branch.sh pushes empty 'A' and 'M' files when merging

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.