Forum Discussion

kylegogtp's avatar
kylegogtp
Contributor
3 years ago

Issue with merging in branches where conflicts or changes do not show in the commit

Running the latest Test complete and Tortoise GIT.   Lately, when pulling in the latest master or trying to merge in a branch the merge will not show any changes in the commit or it will show there...
Integrations
Marsha_R's avatar
Marsha_R
Moderator
3 years ago

What versions of TestComplete and Tortoise are you using?

 

Just my experience - when our team has multiple users sharing a name mapping, we merge it outside TC and then commit it when it works for everyone. 

  • kylegogtp's avatar
    kylegogtp
    Contributor
    3 years ago

    Testcomplete: 15.42.9.7

    TortoiseGIt: 2.13.0.11

     

    I've verified and everyone is using the same versions for both.