[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 Aug 26 07:47:26 EDT 2013

     [ https://issues.jboss.org/browse/JBTM-1527?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Paul Robinson resolved JBTM-1527.

    Fix Version/s: 5.0.0.M5
                       (was: 5.0.0.Final)
       Resolution: Out of Date

No longer applies as we don't attempt to automate conflict resolution anymore.
> 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.M5
>   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. 

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 mailing list