So, I’m trying to use the git integration for UiPath, using a git lab repository that I created, and trying to merge 2 different versions of the same code. Usually when conflicts are detected, a message appears so you can solve these conflicts, but when I try to merge the codes one simply overwrite the other. Is there a way to select what do you want from each code to get the merge done? Thanks in advance
It seems that you have trouble getting an answer to your question in the first 24 hours.
Let us give you a few hints and helpful links.
First, make sure you browsed through our Forum FAQ Beginner’s Guide. It will teach you what should be included in your topic.
You can check out some of our resources directly, see below:
Always search first. It is the best way to quickly find your answer. Check out the icon for that.
Clicking the options button will let you set more specific topic search filters, i.e. only the ones with a solution.
Topic that contains most common solutions with example project files can be found here.
Read our official documentation where you can find a lot of information and instructions about each of our products:
Watch the videos on our official YouTube channel for more visual tutorials.
Meet us and our users on our Community Slack and ask your question there.
Hopefully this will let you easily find the solution/information you need. Once you have it, we would be happy if you could share your findings here and mark it as a solution. This will help other users find it in the future.
Thank you for helping us build our UiPath Community!
Cheers from your friendly
According to our documentation, there should be a window that should allow you to do just that:
but what about merging changes from both Remote and Local versions (Left and Right representation as mentioned here https://docs.uipath.com/studio/docs/field-descriptions-git )
as selecting any of the versions will overwrite the file! there should be a way to select the changes needed from both versions (local and remote)
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.
I would like to further emphasize that this is a much wanted functionality for our team as well.
Is there now a timeframe of when we can expect this to be available?