Hello,
When trying to merge branches from Studio, the Solve Conflicts window popped up. But the save button is always disabled after choosing either remote or Local.
Requesting for help. Thank you…
Hello,
When trying to merge branches from Studio, the Solve Conflicts window popped up. But the save button is always disabled after choosing either remote or Local.
Requesting for help. Thank you…
Hello @shahidh.aqeel.shahul Welcome to the UiPath Community Forum
If the save button is not enabled, it means the versioning has still conflicts and its resolution is pending. If you are sure that all conflicts are resolved, please check the “Permissions” granted for your profile and if you can resolve, commit and push conflicts.
Also, looking at the screenshot, why the comparison windows showing Junk Characters. Try to check for GITHUB UI if you continuously facing the same issue.
Regards,
Shantanu
toggle choose right, choose left till you have resolved the conflict and indicated which one to use.
Then repeat it for the next conflicts till end
Ideally, then the save button should be enabled
There is option in the ribbon choose left and choose right. Hit on the button which you want to select untill the conflicts resolved then the save button will automatically appears.
Hope it helps!!