Re: My first stumper ...

[Derek R. Price]

Matt Gregory wrote:

> is in place).  My second thought was that developer A made some
> mistakes when resolving conflicts when updating to version 1.196, but
> if this were the case, and developer A removed some lines they
> shouldn't have and committed this file, then when developer B updated
> to version 1.197 (or >1.196), the changes from 1.196 should be gone,
> but they're not.

Dev A made some mistakes resolving conflicts and _didn't_ commit them?

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
"I wish you and yours every joy in life, old chap, and tons of money, and
may you never die till I shoot you."

        -James Joyce, "Dubliners"