From: Nick Andrew Date: Sun, 14 Dec 2008 14:55:18 GMT Subject: Re: How to maintain private/secret/confidential branch. Message-ID: <20081214145518.GA26380@mail.local.tull.net> In-Reply-To: On Sun, Dec 14, 2008 at 02:49:50PM +0100, Łukasz Lew wrote: > I don't know how to make such a scenario work: > - two repositories: pub, priv > - priv is clone/branch of pub > - there is some constant developement both in pub and priv > - there are regular syncs with pub in priv > > Problem: > Occasionally I want to push some changes from priv to pub. > Then after syncing with pub I want to get as few conflicts as possible. > > Is it possible to do with git? Git can do almost anything. One should instead ask "How to do this with git?" :-) If I understand your problem, you could solve it with git cherry-pick and rebase. On priv, make a for-public branch from a pub branch. Then cherry-pick the commits you want from your private branch into the for-public branch. Push your for-public branch to pub, then rebase your private branch. Nick.