Ben Walton, 2009-12-29 22:40: > Maybe something like Stacked Git would work for you? > http://www.procode.org/stgit/
Now _that_ is something i've been dreaming of! Thanks a lot. Even if I don't end up using stgit on sup development, I know I'll use it in quite a few other places. > Alternately, if you want to stick to plain git, I'd recommend > something like: > > origin/master -> master > origin/next -> next > | > \ mybranch > > Where 'mybranch' collects your locally desired deviations. Does it "just work" if I have feature branches off of master which are merged to mybranch and the feature patches get accepted and appear to next? -- Tero Tilus ## 050 3635 235 ## http://tero.tilus.net/ _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel
