Picking changes line by line to resolve git merge conficts

[jval94 (Juan Valenzuela)]

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)?

[james.mcneil]

Hi Juan,
I think this is a duplicate of this post here

Git merge from UiPath fully overwriting files

I see now. I think this will be natural progression for this tool. I saved your feedback in our internal tracker and moved the topic to our Feedback category. Although I cannot provide any specific deadlines, I’ll update this topic when the new functionality gets implemented.

It’s currently not supported but please vote at the link to increase awareness for this functionality