Repository FAQ
How long should I keep a non-master branch?
You should keep a non-master branch only until it has been merged to the master and tested there. Once you’ve verified it works, you can get rid of it. Often a checkbox exists for a merge request which will auto-purge the branch should the pipeline triggered build succeed.
What should I do after I merge a branch?
After merging a branch, you should verify the changes are working on the parent branch and delete the feature branch.
What if I have conflicts on merge, how do I resolve them?
With test scripts, often changes from multiple users cannot be merged, or the flow of the script may no longer work as expected. You will have to use a Diff tool and/or review the conflict in the script editor, such as the Test Designer IDE, and choose which script to keep, or how to update the script to keep both changes should that make sense. Most of the time this requires manual investigation and resolution.
How often should I merge?
You should merge whenever the “feature” you are working on a feature branch is deemed complete and successfully tested. Keep in mind, the smaller the changes, additions, or a number of areas impacted are easier it is to troubleshoot where new failures exist instead of many changes.
How many changes should I make in a working branch before merging?
As many changes as needed until the “feature” is deemed complete.
What if we need multiple versions of scripts because we have to run against multiple versions of our software?
We recommend you create separate environment branches and create the feature branches below those.
A nonexistent user (username) is cloning a Repository
When using SSH Key the server (Git server) internally will accept any username. All credentials information is inside the SSH file itself
Last updated: March 12, 2025
If you have any feedback on this topic, please contact us at documentation@appvance.ai