Merging

Gerrit

Best Branching and Merging strategies in Gerrit
ByRajesh Kumar August 22, 2018August 28, 2018

Best Branching and Merging strategies in Gerrit Step 1 – First Lets read this article about Best Branching and Merging strategies in git http://www.scmgalaxy.com/tutorials/best-branching-and-merging-strategies-in-git/ Step 2 – Now Lets learn the Gerrit Merge Types https://nofluffjuststuff.com/magazine/2016/04/understanding_and_applying_gerrit_part_3_gerrit_submit_types_and_git_review Step 3 – Time to Learn the Types of Submit in Gerrit https://gerrit-review.googlesource.com/Documentation/project-configuration.html Step 4 – Finally, You must read…

Read More Best Branching and Merging strategies in Gerrit
Git

Best Branching and Merging strategies in git
ByRajesh Kumar August 22, 2018November 17, 2021

Best Branching and Merging strategies in git Step 1 – First you need to learn the needs of branches. This is very good read. https://docs.microsoft.com/en-us/vsts/repos/tfvc/branching-strategies-with-tfvc?view=vsts Step 2 – Now time has come to Learn best branching model in Git. https://buddy.works/blog/5-types-of-git-workflows https://hackernoon.com/a-branching-and-releasing-strategy-that-fits-github-flow-be1b6c48eca2 https://nvie.com/posts/a-successful-git-branching-model/ Step 3 – Now, Lets understand, what is the kind of merges we…

Read More Best Branching and Merging strategies in git
Perforce

Perforce Merging Process
ByMantosh Singh January 9, 2018February 1, 2025

Perforce Merging Process In Perforce when we have conflict in files, “?” notion comes with the files which says this need to be resolved. Once you select the file and click on Resolve, it will be given following options… Auto 1. Accept Changed file (Only one files differs from the base 2. Merge yours and…

Read More Perforce Merging Process
Uncategorised

Merging Functionality in TFSC
ByMantosh Singh January 6, 2018January 6, 2018

The merging functionality in TFSC is centered on the following typical development scenarios: Scenario 1: The catch-up merge— The user wants to merge all changes from a source branch that have not yet been migrated to the target branch. The source and target can be a subtree or an individual file/folder. Scenario 2: The catch-up no-merge— The…

Read More Merging Functionality in TFSC
Uncategorised

Branching and Merging Best Practices | Branching and Merging Guide
ByRajesh Kumar February 22, 2011December 25, 2017

Branching and Merging Practices Branching and Merging Practices from Rajesh Kumar Rajesh KumarI’m a DevOps/SRE/DevSecOps/Cloud Expert passionate about sharing knowledge and experiences. I have worked at Cotocus. I share tech blog at DevOps School, travel stories at Holiday Landmark, stock market tips at Stocks Mantra, health and fitness guidance at My Medic Plus, product reviews…

Read More Branching and Merging Best Practices | Branching and Merging Guide