Here's what I would do
1. Clone your fork somewhere.
2. Create a new branch back at the point at which your rails app was
using the plugin, before your changes, check it out
3. Copy over your files from the rails plugin, commit in your changes
4. Check out master, merge your branch
5. Push up your changes to your fork, be sure to include the merge
6. Send off a pull request if you want your changes merged into the
plugin
7. Copy over your new files to the rails app, commit
At that point, you could either bring in your fork as a submodule instead of
committing the files directly, or you could clone the repo in, but continue
to add the files directly instead of using a submodule (this is what I do).
Or, of course, you can just leave your fork repo external to the app and
copy the files in any time you want to update them.
Tekkub
GitHub General Support
http://support.github.com/
Join us on IRC: #github on freenode.net
Discussion group: [email protected]
On Mon, Mar 23, 2009 at 11:46 AM, yitzhakbg <[email protected]> wrote:
>
> Still a Git newbie. I added (Stonean/) Lockdown as a plugin in my
> Rails project using Braid, but skip the Braid part for now. It's not
> relevant to the question.
>
> The Lockdown plugin lives in vendor/plugins, but is incorporated in
> the main project repo. It doesn't have a repo of it's own.
> Now I want to merge the latest Lockdown changes with my own local
> changes and additions, some of which are significant so I forked
> Stonean/Lockdown (it's at yitzhakbg/Lockdown). At this point I'm
> stuck.
>
> What should I do? How?
> Initialize a local repo for my copy of the plugin and then define
> yitzhakbg/Lockdown as a remote? If so, what's preferable, merging or
> rebasing? If not, should I do it the other way 'round? I'd greatly
> appreciate some clear instructions.
> Thanks,
> Yitzhak
> >
>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"GitHub" 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/github?hl=en
-~----------~----~----~----~------~----~------~--~---
