After the Merge
and I Still Got Work to Do

First, XXX builds the "example" program, incorporating his changes:

xxx% clearmake
Cannot reuse "main.o" - version mismatch for "main.C"

======== Rebuilding "main.o" ========
	CC -c -I. -I../pkgs/corp/include main.C
Will store derived object "/tmp/sjk_demo/src/main.o"
========================================================

Must rebuild "example" - due to rebuild of subtarget "main.o"

======== Rebuilding "example" ========
	CC -o example main.o
Will store derived object "/tmp/sjk_demo/src/example"
========================================================

Must rebuild "all" - due to rebuild of subtarget "example"

======== Rebuilding "all" ========
	echo all done
all done
========================================================

And checks that all is well:

xxx% example
**************************************
**************************************
**************************************
**************************************
You get = 100% of a pie.   <-- A satisfactory amount of pie!
**************************************
**************************************
**************************************
**************************************

And then checks-in the results of the merge:

cleartool ci -nc `cleartool lsco -cview -all -s`
Checked in "/tmp/sjk_demo/src/main.C" version "/main/xxx_R94/3".