cancel
Showing results for 
Search instead for 
Did you mean: 

What is the best branching strategy

SOLVED
Highlighted
Occasional Contributor

What is the best branching strategy

Hi 

 

We are a team of 3 testers and we have been having merge conflicts in NameMapping files while checking in the code in Azure Repos

 

We usually try to avoid working on the same test cases to minimize the merge conflicts. but still we end up having some in name mapping and if that is not merged correctly that results in loosing namemappings on either of the teammates scripts and we have to re map them

 

what is the best branching strategy in our situation. 

 

1. Create branches for each of the team members in the team and  a main branch?

2. Creating branches for the specific feature we are automating (The way development is done sometimes)

 

What is the best branching strategy in general for automation.

 

Thanks in Advance

2 ACCEPTED SOLUTIONS

Accepted Solutions
Highlighted
Community Hero

Re: What is the best branching strategy

The team strategy we used to keep the name mapping straight is to only let one person check it in.   Once every couple of weeks or so, depending on how much work is being done, one person would collect name mapping files from everyone and use an empty project to merge them inside TestComplete.  Then that name mapping is passed back to everyone and they make a backup copy of their own file and then try their tests with the new one.  Once everyone is happy with the new one, it is checked in.   This was rotated amongst the team members so no one got stuck with it all the time.  This also served to make sure that no one's name mapping got changed without their knowledge.

 

 

View solution in original post

Highlighted
Community Hero

Re: What is the best branching strategy

Hi,

 

I am third to Marsha after Benoit 🙂

In general, test automation is a development process, so the generic development workflow should work for automation as well.

The case is that NameMapping file should be treated as the binary one for all version control systems and should not be merged using their means.

I heard several times that NameMapping merging provided by TestComplete works (and Marsha confirmed this on more time) but never heard that merging by any version control system provided a good result.

 

Regards,
  /Alex [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
================================

View solution in original post

5 REPLIES 5
Highlighted
Community Hero

Re: What is the best branching strategy

The team strategy we used to keep the name mapping straight is to only let one person check it in.   Once every couple of weeks or so, depending on how much work is being done, one person would collect name mapping files from everyone and use an empty project to merge them inside TestComplete.  Then that name mapping is passed back to everyone and they make a backup copy of their own file and then try their tests with the new one.  Once everyone is happy with the new one, it is checked in.   This was rotated amongst the team members so no one got stuck with it all the time.  This also served to make sure that no one's name mapping got changed without their knowledge.

 

 

View solution in original post

Highlighted
Community Manager

Re: What is the best branching strategy

This is a great question @testbuilder !

 

Marsha, thank you for this informative reply. Let's see if we can get more people to share their ideas here🙂

 

@tristaanogre @Reshail @cunderw @BenoitB @AlexKaras , what do you guys think?


Sonya Mihaljova
Community and Education Specialist

Learn SmartBear products in a fun and easy way and prove your knowledge!
>>Participate in the TechCorner Challenge today
Highlighted
Community Leader

Re: What is the best branching strategy

We dont use name mapping.

We don't do testing with dev but we do test for final customer, far away of dev team.

We use OOP approach with closure implementation.

Every business method is an object of a parent object of the software tested.

 

Sorry cannot help you but imho the @Marsha_R way is the good one. Always reduce the complexity of the control to be done.

Un sourire et ça repart

Highlighted
Community Hero

Re: What is the best branching strategy

Hi,

 

I am third to Marsha after Benoit 🙂

In general, test automation is a development process, so the generic development workflow should work for automation as well.

The case is that NameMapping file should be treated as the binary one for all version control systems and should not be merged using their means.

I heard several times that NameMapping merging provided by TestComplete works (and Marsha confirmed this on more time) but never heard that merging by any version control system provided a good result.

 

Regards,
  /Alex [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
================================

View solution in original post

Highlighted
Occasional Contributor

Re: What is the best branching strategy

Thanks @Marsha_R  and @sonya_m , @BenoitB @AlexKaras  for your  answers.  I will try implementing this for our project. 

New Here?
Join us and watch the welcome video:
Announcements
Top Kudoed Authors