[CCC DEV] Status E Changes

[Matt Jadud]

Hi Dennis,

On Mon, Jun 14, 2010 at 9:14 PM, Matt Jadud <jadudm at gmail.com> wrote:
> On Mon, Jun 14, 2010 at 8:17 PM, Dennis Meade <meade.dennis at gmail.com> wrote:
>> Would you be kind enough to tell me which modules you changed to expand on
>> the Status E  message? I'm not comfortable enough to update my code directly
>> from the repository.

See

https://projects.cs.kent.ac.uk/projects/kroc/trac/wiki/MergingTrunkToBranch

which should help get you going.

To anyone else: please update that page if you don't like the merge
instructions, or think it should be done differently. That worked, but
I don't know if there are preferred tools, etc.

Cheers,
Matt