Ask a Question

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

kylegogtp
Contributor

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 are conflicts but not show or list any conflicts.

 

I've tried reverting changes and merging in branches in different order or using different machines to try and merge. I have also re-cloned the repo on the machines and nothing seems to allow merges once in this state.

 

I have to resort to manually merging tests and name mappings into a single branch and merge it in a single PR.

 

I haven't had any issues like this until recently.

3 REPLIES 3
Marsha_R
Community Hero

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. 


Marsha_R
[Community Hero]
____
[Community Heroes] are not employed by SmartBear Software but
are just volunteers who have some experience with the tools by SmartBear Software
and a desire to help others. Posts made by [Community Heroes]
may differ from the official policies of SmartBear Software and should be treated
as the own private opinion of their authors and under no circumstances as an
official answer from SmartBear Software.
The [Community Hero] signature is used with permission by SmartBear Software.
https://community.smartbear.com/t5/custom/page/page-id/hall-of-fame

Testcomplete: 15.42.9.7

TortoiseGIt: 2.13.0.11

 

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

Since that sounds like it happened around the time you updated, I suggest contacting Support directly. Here's the link:

https://support.smartbear.com/testcomplete/message/


Marsha_R
[Community Hero]
____
[Community Heroes] are not employed by SmartBear Software but
are just volunteers who have some experience with the tools by SmartBear Software
and a desire to help others. Posts made by [Community Heroes]
may differ from the official policies of SmartBear Software and should be treated
as the own private opinion of their authors and under no circumstances as an
official answer from SmartBear Software.
The [Community Hero] signature is used with permission by SmartBear Software.
https://community.smartbear.com/t5/custom/page/page-id/hall-of-fame
cancel
Showing results for 
Search instead for 
Did you mean: