I found an answer to my question. I have documented it here: http://blog.futureshock-ed.com/2009/01/how-to-merge-to-repositories-on-mac-os.html
Peter On Jan 19, 5:31 pm, Peter <[email protected]> wrote: > My question is in regards to merging from a mainline repository to a > cloned repository, after there have been changes in the clone. > > Is this possible? I've been reading various books and googling this > question, but I haven't been able to find this scenario. > > If my question isn't clean, I'll try to clarify with an example: > > Say there is a project on Gitorious, called "A" (mainline). I make a > clone "B" so I can play with it. > A while later, after having made a few changes in "B", I hear that > there are some interesting additions in "A". I would like to add those > additions to "B" so I can continue the work I started until "B" is > ready for a merge with "A". > > Is this scenario possible? Any suggestions? > > Thanks! --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Gitorious" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/gitorious?hl=en -~----------~----~----~----~------~----~------~--~---
