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 theirs if no conflict exists
3. Accept yours
4. Accept theirs
5. Merge yours and theirs including conflict markers
Interactive – Interactively resolve files one at a time
Let’s try to first resolve the conflict with Auto options but if the conflict is not resolved then try to use interactive option which gives greater flexibility to resolved the conflict and submit the changes.
I am working as a Training Development Manager in Cotocus, managing a team of Trainers, Consultants, and Experts who support DevOps, DevSecOps, Master in DevOps, Site Reliability Engineering (SRE) training, consulting and outsourcing projects for our Corporate clients and individuals.
In just 4 years of hard work and commitment to deliver results, our organization is continuously growing and serving 30+ clients globally. We ensure the highest levels of certainty and satisfaction through a deep-set commitment to our clients with our comprehensive industry expertise and a global network of innovative professionals. Our dedication towards delivering the right solution and approach has earned us top clients from the industry with the highest satisfaction rating.
We provide over 40 specialized programs on DevOps, Cloud, and Containers, DevSecOps, SRE, MDE that are focused on industry requirements and each curriculum is developed and delivered by leading experts in each domain and aligned to authoritative certification bodies.
Contact me at contact@DevOpsSchool.com
In just 4 years of hard work and commitment to deliver results, our organization is continuously growing and serving 30+ clients globally. We ensure the highest levels of certainty and satisfaction through a deep-set commitment to our clients with our comprehensive industry expertise and a global network of innovative professionals. Our dedication towards delivering the right solution and approach has earned us top clients from the industry with the highest satisfaction rating.
We provide over 40 specialized programs on DevOps, Cloud, and Containers, DevSecOps, SRE, MDE that are focused on industry requirements and each curriculum is developed and delivered by leading experts in each domain and aligned to authoritative certification bodies.
Contact me at contact@DevOpsSchool.com
Latest posts by Mantosh Singh (see all)
- Docker Tutorials: Detached (-d) mode in Docker – Explained - October 3, 2022
- Enhance your Business with – Google My Business – All you need to know - August 1, 2022
- Top 20 SRE interview questions and answers. - June 15, 2022
