I need to merge the streams using commands in P4. can anyone help me with this? the two streams are parent child streams. I need to merge down from parent to child.
I'm typing this from memory, without actually trying it, but I think this is pretty close:
p4 client -s -S child
p4 sync
p4 merge
p4 resolve
p4 submit
Of course, make sure that you're working with the correct client workspace, as the correct user, etc., by running p4 set
before you start this process, to look at your P4CLIENT, P4USER, etc. settings.