Change 32991
Merge Down to //p4-sdp/dev_rebrand with 'p4 merge' from //p4-sdp/dev.
p4 merge
p4 resolve -n|wc -l # 43 file at start.
p4 resolve -as
p4 resolve -n|wc -l # 25 files remain after automatic/safe resolve.
p4 resolve -am
p4 resolve -n|wc -l # 12 files remain after automatic merge/resolve.
p4 resolve # Manual merge of remaining files.
The manual merges were mostly due to the change related to the format of the
Version string.
p4 merge
p4 resolve -n|wc -l # 43 file at start.
p4 resolve -as
p4 resolve -n|wc -l # 25 files remain after automatic/safe resolve.
p4 resolve -am
p4 resolve -n|wc -l # 12 files remain after automatic merge/resolve.
p4 resolve # Manual merge of remaining files.
The manual merges were mostly due to the change related to the format of the
Version string.
Tip: Use n and p to cycle through the changes.