From: Jeff King <peff@peff.net>
Date: Fri, 13 Jun 2008 16:09:11 GMT
Subject: Re: Working with Git and CVS in a team.
Message-ID: <20080613160911.GB3140@sigill.intra.peff.net>
In-Reply-To: <200806131633.34980.mirko.stocker@hsr.ch>

On Fri, Jun 13, 2008 at 04:33:34PM +0200, Mirko Stocker wrote:

> 1) I use git-cvsimport to update the repository every night. /git-proj
>    is a "clone --bare" of the /from-cvs repository.
> 
> 2) After the import, I push the changes from CVS to /git-proj using
>    'git push /git-proj origin'.

You could simplify this by just cvsimporting to an 'upstream' branch in
git-proj.

> 3) Then we have the role of a "Merge-Dude" who pulls the changes from
>    /git-proj and uses 'git merge origin/origin' to update his master.
>    If there are any conflicts, he resolves them and pushes everything
>    back to the master at /git-proj.

And then it works the same: he just pulls 'upstream' occasionally,
merges it into your work, and then pushes the result.

-Peff