Re: CVS

[Geert U. <ge...@li...>]

On Mon, 29 May 2000, Michel Dänzer wrote:
> Frank Petzold wrote:
> > On Mon, May 29, 2000 at 10:34:39AM +0200, Michel Dänzer wrote:
> > > Do changes to the trunk get applied to the branch?
> > 
> > You can merge them.
> 
> But unless one merges them, the branch 'stands still' except for the files one
> works on?

Yes. Your own branch doesn't track changes on the main branch. You have to
explicitly merge them from the main branch to your own branch.

And when everything is finished and working, you merge back your branch to the
main branch (trivial, since you first merged the main branch to your own
branch).

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds