Uploaded image for project: 'Nuxeo Studio'
  1. Nuxeo Studio
  2. NXS-5648

Cannot review changes to choose when merging branch into workspace

    XMLWordPrintable

    Details

      Description

      • In Studio, enter Advanced commit mode
      • Create 2 branches in Studio Modeler
      • In branch1, create an automation scripting with a comment on the first line:
        //12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890

        and save work in progress, commit, push as "comment1"

      • In branch2, create an automation scripting with a comment on the first line:
        //abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz

        and save work in progress, commit, push as "comment2"
        ==> Your workspace is currently "branch2"

      • In the branch management screen, merge "branch1" into your workspace
        ==> You will have a conflict to resolve: you can review the file on the right hand side, but you cannot review the changes on the left hand side due to the horizontal scrollbar not permitting it.

      This issue is due to the length of the line entered in the branches

      Expected result; being able to compare or at least review the changes in the 2 branches being merged

        Attachments

          Issue Links

            Activity

              People

              • Votes:
                1 Vote for this issue
                Watchers:
                4 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Time Tracking

                  Estimated:
                  Original Estimate - Not Specified
                  Not Specified
                  Remaining:
                  Remaining Estimate - 0 minutes
                  0m
                  Logged:
                  Time Spent - 3 days, 4 hours
                  3d 4h

                    PagerDuty

                    Error rendering 'com.pagerduty.jira-server-plugin:PagerDuty'. Please contact your Jira administrators.