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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
