Perforce Merging Instructions Archives - scmGalaxy https://www.scmgalaxy.com/tutorials/tag/perforce-merging-instructions/ A Platform for Software Engineers Sat, 27 Feb 2021 09:09:52 +0000 en-US hourly 1 https://wordpress.org/?v=7.1 Perforce Merging Process https://www.scmgalaxy.com/tutorials/perforce-merging-process/ https://www.scmgalaxy.com/tutorials/perforce-merging-process/#respond Tue, 09 Jan 2018 06:09:44 +0000 http://www.scmgalaxy.com/tutorials/?p=4568 Perforce Merging Process In Perforce when we have conflict in files, “?” notion comes with the files which says this […]

The post Perforce Merging Process appeared first on scmGalaxy.

]]> 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.

The post Perforce Merging Process appeared first on scmGalaxy.

]]> https://www.scmgalaxy.com/tutorials/perforce-merging-process/feed/ 0