(RPA) Support Tip: Conflicts cannot be solved in Workflow Designer SCM

1 Likes

When trying to merge two branches by using Micro Focus Robotic Process Automation (RPA) Workflow Designer software configuration management (SCM), some git conflicts must be solved first. Git app source tree is used to manage versions and local branches. The repositories and origin branches stay at a bitbucket server which is used as well to manage the origin branches. However when clicking the "resolve conflicts" in SCM the options to choose between "use mine" or "use theirs" are not seen.

The problem occurs when the file path is too long. Other columns of the table overflow from the model and are not shown in SCM UI. 

To fix the problem, apply https://rdapps.swinfra.net/hotfix/#/hotfix/24439.

Labels:

Support Tip
Comment List
Related
Recommended