Search code examples
perforceosbperforce-client-spec

Auto Merge in perfoce


Hi I have below branches in perforce, (4B, 4B2, 4C1), Now I want that my code can auto-merge from 4B -> 4B2 -> 4C1. This is OSB code. It has pipelines, business services, Xqueries, etc

Can anyone help?

enter image description here


Solution

  • Step 1: Live a good life free of karmic burden, and make a wish upon a star that you will not have any merge conflicts.

    Step 2:

    p4 switch 1105-OSBSIT-4B2
    p4 merge --from 1104-OSB-SIT-4B
    p4 resolve -am
    p4 submit
    
    p4 switch 1106-OSB-SIT-4C1
    p4 merge --from 1105-OSBSIT-4B2
    p4 resolve -am
    p4 submit
    

    If step 2 doesn't work you messed up some part of step 1.