Hi Yves on 06.01.2014 10:34, Yves Blusseau wrote: > Hi kp, > > no « renaming » branch is not the right thing to do. Also removing > integration branches on the repository is not a good idea :D > > It seems there a problem has my local maint branch is now not « attach » to a > remote maint branch (do you remove or change the maint branch) ? > > In any case we only do fast-forward for integration branch !! > > I have update the Git Workflow guide to explain how to manage the maint > branch after a new release: > http://goo.gl/dAxfQ2 > > so in our case we need to COPY the old maint branch to another name: > maint-4.x if we want to continue to maintain it or v4.x if the branch will > not get updates: > git branch maint-4.x maint > or > git branch v4.x maint > > After that we need to fast forward the maint branch to master so the master > branch become the new maint branch: > git checkout maint > git merge —ff-only master > > After that we can work on master like before and tag the new releases.
All this sounds fine for the central repository, would you mind to elaborate this for the distributed (workspace) repositories? What is the canonical way distribute the new repository structure? cheers Erich
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
