On Mon, Jun 13, 2011 at 9:46 PM, Tomek CEDRO <tomek.ce...@gmail.com> wrote: > On Mon, Jun 13, 2011 at 6:42 PM, Øyvind Harboe <oyvind.har...@zylin.com> > wrote: >> I'll update master branch. >> >> The way git works we don't cut development branches, we just >> keep working on master branch. >> >> We may cut a 0.5 branch from some previous time in master >> history later on. > > Ah, there is 0.4.0 so anyone can snap between then and HEAD, and the > same with 0.5.0.. git! ;-) > > Good luck with merging.
We never will merge 0.5.0 release branch into the master branch, ideally it would receive zero, but realistically might receive a few commits. Possibly reverting commits in master branch? -- Øyvind Harboe Can Zylin Consulting help on your project? US toll free 1-866-980-3434 / International +47 51 87 40 27 http://www.zylin.com/zy1000.html ARM7 ARM9 ARM11 XScale Cortex JTAG debugger and flash programmer _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
