# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 15465 | alan_petersen | Merging using sdp_alan_petersen | ||
//guest/perforce_software/sdp/dev/doc/commit-edge-failover.odt | |||||
#1 | 12923 | C. Thomas Tyler |
Routine merge down from main to dev. Resolved with 'p4 resolve -as', no merges or conflicts. |
||
//guest/perforce_software/sdp/main/doc/commit-edge-failover.odt | |||||
#1 | 12287 | Russell C. Jackson (Rusty) | commit/edge failover doc. |