Solve Conflicts During GitHub Commit & Push on UiPath Studio

Important Links:
🔥 Visit Channel : / automatewithrakesh
🔥 To Subscribe : bit.ly/3J6b48k
🔥 Python Videos : bit.ly/3r4AXzd
🔥 UiPath Videos : bit.ly/3udDx8a
🔥 Linkedin : bit.ly/3J6bMm0
🔥 Fb UiPath Grp : bit.ly/3x2iZ4d
🔥 Fb Page : bit.ly/3LMeXkn *****
Dear Learners, I need your support too!
Please Subscribe to my channel and show your kind support!
Link to UiPath Beginners Playlist:
• UiPath Tutorial | Uipa...
Link to UiPath Excel and DataTable Playlist:
• UiPath Tutorial | Buil...
Link to UiPath Key Technique Playlist:
• Move File Uipath | Uip...
Link to UiPath Email Automation Playlist:
• UiPath Tutorial | Uipa...
Link to UiPath PDF Automation Playlist:
• UiPath Tutorial | Uipa...
Link to UiPath ReFramework Playlist:
• UiPath Tutorial | Uipa...
Link to UiPath Classic and Modern Excel Activities Playlist:
• UiPath Tutorial | UiPa...
Link to UiPath Regular Expression Playlist:
• Uipath Regex
Link to UiPath Orchestrator Playlist:
• Uipath Orchestrator Ho...
Link to Advance UiPath Orchestrator Playlist:
• How to Use Storage Buc...
Link to UiPath VB dot Net PlayList:
• UiPath VB.Net Complete...
Link to UiPath Use Case Playlist:
• UiPath Birthday Remind...
Link to UiPath Selectors Playlist:
• UiPath Introduction to...
Link to UiPath Enhanced Selectors Playlist:
• UIPath Enhanced Select...
Link to UiPath Computer Vision Playlist:
• Learn UiPath Computer ...
Link to UiPath Interview Series Playlist:
• UiPath Interview Quest...
Link to UiPath Document Undestanding Playlist:
• UiPath Document Unders...
Link to UiPath Action Center Playlist:
• UiPath Action Center i...
Link to UiPath Error and Fix Playlist:
• UiPath Error Message#1...
Link to UiPath Activities Playlist:
• Parallel For Each in U...
Link to UiPath Certification Playlist:
• UiPath DataTable Selec...
Link to UiPath Background Automation Playlist:
• Background Process Aut...
Link to UiPath Logs Playlist:
• UiPath Logs | UiPath L...
Link to UiPath GitHub Integration Playlist:
• How to Create a GitHub...
Link to UiPath API Integration Playlist:
• API | API in UiPath |...
Link to Python Playlist:
• How to Create a GitHub...

[@prashantthube]

hi Rakesh , Thanks for this .. What if we want to kep both side data 50-50 % , Means some code from Developer 1 and some code from developer 2... While Resolving Conflicts ..how we tackle this scenario ? .. Thanks!

[@UiPathUser]

I think we need to do merge changes where you can keep both the changes done by developer 1 and developer 2 - i know Bitbucket has those features

[@knarte2682]

That's something Uipath should change, because sometimes we need to modify several stuff, and maybe another developer made some selector fixes, then once of the workflows will be lose :( it will be cool if you can select what kind of changes you want to keep of each workflow (remote and local) that will be real useful in real world

[@meghalandge5126]

Hello Rakesh i got error while push and commit my code from UiPath to repo, says like: current branch is out of date
could you please tell me any suggestions on this?

[@AutomatewithRakesh]

When you encounter the error message "current branch is out of date" while trying to push and commit your code from UiPath to a repository, it typically means that the branch you are working on has been updated by someone else, and your local branch is not up to date with the latest changes. Check all these areas. Pull the latest changes: Start by pulling the latest changes from the remote repository. This step updates your local branch with the latest code modifications made by others.

[@chetnagiri4904]

Rakesh, After sign-out and sign in to Github,I am not getting the pop-up message "The current branch is out of date". Can you please let me know why is it so?

[@chethangowdabn2649]

I am also not getting "The current branch is out of date " pop-uo

[@girishkrishna4654]

This is interesting!