Change 32727
p4 merge
p4 resolve -n | wc -l # 29 files.
p4 resolve -as
p4 resolve -n | wc -l # 13 files eft after handling trivial merges.
p4 resolve -am
p4 resolve -n | wc -l # 2 files eft after handling trivial merges.
p4 resolve # For the last 2 files, manual resolve done for p4sanity_check.sh and sdp_upgrade.sh.
p4 resolve -n | wc -l # 29 files.
p4 resolve -as
p4 resolve -n | wc -l # 13 files eft after handling trivial merges.
p4 resolve -am
p4 resolve -n | wc -l # 2 files eft after handling trivial merges.
p4 resolve # For the last 2 files, manual resolve done for p4sanity_check.sh and sdp_upgrade.sh.
Tip: Use n and p to cycle through the changes.