-
Type: Improvement
-
Status: Resolved
-
Priority: Major
-
Resolution: Fixed
-
Affects Version/s: 3.23.0
-
Fix Version/s: 3.28.0
-
Component/s: Versioning & Branch management
-
Tags:
-
Backlog priority:600
-
Sprint:NOS 11.1.28 - 2020-02 2
-
Story Points:5
- 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
- depends on
-
DESIGN-486 Branch management screen - Review branch changes
- Resolved