[Soc-2005-dev] CVS merge

[Brecht Van Lommel]

Hi,

Nils Thuerey wrote:
> Hello,
> 
> 
>>Actually, better make it:
>>cvs update -jHEAD:2005-07-18 -jHEAD
> 
> That seems to work better - no conflicts then... Stupid question, but
> what is that command doing? Updating with the version of july 18th? When
> I run a "cvs update -jHEAD" afterwards, I get the conflicts again...

It only merges the changes from july 18th up to now. So that if you are already
in sync with the july 18th version, you don't have to deal again with the
conflicts caused by changes before july 18. You need to pick the right date
depending on your last merge, to get all the changes.

Brecht.