qpid-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Aidan Skinner" <ai...@apache.org>
Subject Re: Git qpid-port repo has a new "windows" branch
Date Tue, 10 Jun 2008 16:28:03 GMT
On Tue, Jun 10, 2008 at 5:17 PM, Steve Huston <shuston@riverace.com> wrote:

> If anyone with more git experience has input, we're all ears...

It's probably easiest if you track svn on master via svn rebase and
then git rebase your branches against that, that way the person who
made the origional change (on the branch) can fix any conflicts that
occur as they happen.

- Aidan
-- 
aim/y!:aidans42 g:aidan.skinner@gmail.com
http://aidan.skinner.me.uk/
"We belong to nobody and nobody belongs to us. We don't even belong to
each other."

Mime
View raw message