Picking changes line by line to resolve git merge conficts

Hi, I am working on an automation script with other teammates. We saw that UIPath had git integration and has the ability to resolve conflicts. One thing we noticed though is that it appears to be an all or nothing approach to resolve conflicts. You can either choose to keep the local copy or the remote copy. Is there something we’re missing in order to accept changes line by line? Can we choose to keep changes from both files (some from remote, some from local)?

1 Like