From: Hans-Christoph Steiner Date: Sun, 12 Dec 2010 22:24:16 GMT Subject: developing a modified Linux-style workflow Message-ID: <7EAE16CF-A9A8-47A6-9294-3646CCDB0E9C@at.or.at> Hey all, (and my second post on this list...) I've gotten pretty good at git, and its helping me already with managing the very odd workflows I have with the software I work a lot on called Pd (http://puredata.info). My role in Pd development is like a Linux lieutenant. I also the main dev for an app called Pd-extended, which is based on Pd. Now I'm stuck trying to figure out how to use git to match my current workflow for Pd-extended, which is a kind of long-lived branch, almost like a friendly fork. So its kind of close to the Linux workflow with me as a lieutenant, but not quite. What makes it tricky is that I make releases directly from my repo that are widely used. So my repo is both lieutenant and dictator at the same time. So that's where I am stumped. I want to be able to rebase and push to a public repo, but that would be stupid. So there has got to be another way. .hc ---------------------------------------------------------------------------- I have the audacity to believe that peoples everywhere can have three meals a day for their bodies, education and culture for their minds, and dignity, equality and freedom for their spirits. - Martin Luther King, Jr.