Change 32658
Upkeep merge from Classic to Streams.
p4 -s merge -c <CL> -b SDP_Classic_to_Streams
p4 -s resolve -as
# One file needed override handling. This will undo local changes, but
# there shouldn't be any. We'll deal with local changes when we merge
# down to dev_rebrand.
p4 resolve -at //p4-sdp/dev/Server/Unix/p4/common/bin/templates/template.sh
p4 submit -c <CL>
p4 -s merge -c <CL> -b SDP_Classic_to_Streams
p4 -s resolve -as
# One file needed override handling. This will undo local changes, but
# there shouldn't be any. We'll deal with local changes when we merge
# down to dev_rebrand.
p4 resolve -at //p4-sdp/dev/Server/Unix/p4/common/bin/templates/template.sh
p4 submit -c <CL>
Tip: Use n and p to cycle through the changes.