What should be the general approach to handle git merge conflicts

Hi Guyz, we are working on project where we have huge pool of objects which we are sharing among ourselves to create test cases…

In this case we are facing merge conflicts while git pull/push and also disappearing of objects/references which causes us to remap some of the objects? (Is this a common issue)

Please suggest a good approach to work on katalon projects where we share a lot of common objects…

Thanks

1 Like

We are 2 here testing and having the same issue …