Aidan Skinner escribió:
On Tue, Jun 10, 2008 at 5:17 PM, Steve Huston <[EMAIL PROTECTED]> 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.
I agree with that. It's easier to have an unique reference of the svn
evolution in the master branch.
Is git rebase needed in the master branch, anyway? Don't we just need to
keep upgrading that branch with the stuff coming from the svn repo? I
think that rebase is intended when you want to merge local changes and
the evolution of an external resource, true?
So, in my mind:
-Somebody updating the master branch with svn stuff. Steve, could you
perform that task. I'm afraid I would need some other tool, and suffer
another dependency hell in solaris.
-People working in the windows/solaris/whatever branches rebasing
against the trunk to keep updated, and be able to generate patches that
could be applied against svn head.
Best regards.
--
Manuel.
- Aidan
--
aim/y!:aidans42 g:[EMAIL PROTECTED]
http://aidan.skinner.me.uk/
"We belong to nobody and nobody belongs to us. We don't even belong to
each other."
