Thanks. Is there a way to block merging from the special branches? Some config setting or something to prevent a potential mistake?
On Nov 9, 8:05 pm, Tekkub <[email protected]> wrote: > That is one way to do it... just be careful you never merge from the > "special" branches or you're going to mix things up quickly. The other > route would be to structure your code so that the "custom" stuff is all in > one subdirectory, then exclude that path from git with the .gitignore file. > Then you could maintain repos for each of the custom setups, or simply > downloads if those files don't really change. You could also do it in > reverse, move the common stuff into one path, break it out into its own > repo, and then submodule that repo into each of the custom design repos. > > Tekkub > GitHub Tech Support > http://support.github.com/ > Join us on IRC: #github on freenode.net > Discussion group: [email protected] > > On Mon, Nov 9, 2009 at 3:52 PM, Taurus <[email protected]> wrote: > > > Ok, I've been piddling around a bit and think I've got it. If any of > > this seems crazy then please point it out. I'm keeping two separate > > editions using branching like so: > > > git branch doctors_edition > > > git branch lawyers_edition > > > If I need to make a change to a file which is common to both branches > > I just do this: > > > git checkout master > > > [do my edits and commit the changes to the master branch...] > > > git checkout doctors_edition > > > git merge master > > > git checkout lawyers_edition > > > git merge master > > > These merge commands bring the changes common to both editions into > > the edition branches themselves. > > > Again, if any of this is crazy or there is a more efficient way to do > > this - please give me a shout... > > > Thx > > > On Nov 9, 4:54 pm, Taurus <[email protected]> wrote: > > > Forgot to start with what I think I should do: > > > > git branch doctors_edition > > > > git branch lawyers_edition > > > > Perhaps it's as simple as that? > > > > On Nov 9, 4:09 pm, Taurus <[email protected]> wrote: > > > > > Git/Github noob here with a what I hope is a quick question. I've read > > > > through some of the docs and checked out some screencasts and I'm > > > > still not sure on exactly how to pull off what I need to do. I have > > > > an app which I need to split into two separate 'editions'. For example > > > > my app is a billing app and I need one edition for doctors and one for > > > > lawyers. They both share a large amount of code but there are key > > > > differences which necessitate separating them. Assuming I'm starting > > > > with the 'base edition' in a git repo, how do I accomplish the above? > > > > > Thanks a Bunch, > > > > > Taurus --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
