Re: Working on sources in parallel

[Matthias Kaeppler]

I have another question.

Let's stick to the scenario Christopher made up. Say person1 thinks it'd 
be a good idea to remove some helper-function foo(), and replace it with 
another function bar(). Then he commits the sources.
Person2 still works on the outdated source, where foo() exists, and he 
thinks it'd be a good idea to introduce a new variable or whatever in 
foo(), so his changes to the file are limited to the function foo.
Now he wants to commit his changes, and CVS complains "sorry bro, update 
first". Okay, so he does an update, and... now what?
What does CVS do in such a situation? How could it merge the two 
sources, with changes to a function foo() which was removed by person1?

So many questions :)

--
Matthias Kaeppler