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 -~----------~----~----~----~------~----~------~--~---
