From: Jeff King <peff@peff.net>
To: Mirko Stocker <mirko.stocker@hsr.ch>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Working with Git and CVS in a team.
Date: Fri, 13 Jun 2008 12:09:11 -0400 [thread overview]
Message-ID: <20080613160911.GB3140@sigill.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2008-06-13 16:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-13 14:33 Working with Git and CVS in a team Mirko Stocker
2008-06-13 14:50 ` Miklos Vajna
2008-06-13 20:43 ` Mirko Stocker
2008-06-13 20:47 ` Miklos Vajna
2008-06-15 20:20 ` Mirko Stocker
2008-06-15 20:34 ` Miklos Vajna
2008-06-16 16:04 ` John J. Franey
2008-06-16 16:44 ` Jakub Narebski
2008-06-13 16:09 ` Jeff King [this message]
2008-06-13 20:47 ` Mirko Stocker
2008-06-13 20:55 ` Jeff King
2008-06-15 20:22 ` Mirko Stocker
2008-06-15 20:48 ` Jeff King
2008-06-16 13:39 ` Mirko Stocker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080613160911.GB3140@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mirko.stocker@hsr.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).