I don't think main is obsolete, but one should be conscious about branches. I
prefer a main parent with a dev branch that periodically gets merged over to
main for cutting an RC to QA. For larger products, I have feature branches
that are children of dev and this can be very useful when features overlap
and/or developers are not co-located, etc.
But, it can be taken too far. One project I worked on had 39 branches (four of
which were various states of main), and required a complex set of Perl scripts
to keep them all merged up (some of the branches were special views for
overseas consumption only).
Your mileage may very. The main thing is to have a strategy to control change
and manage history.
--
John Merryweather Cooper
Build & Install Engineer - ESA
Jack Henry & Associates, Inc.(r)
Shawnee Mission, KS 66227
Office: 913-341-3434 x791011
jocoo...@jackhenry.com<mailto:jocoo...@jackhenry.com>
www.jackhenry.com<http://www.jackhenry.com/>
From: Bruce Cran [mailto:br...@cran.org.uk]
Sent: Thursday, February 6, 2014 5:01 PM
To: WiX toolset developer mailing list
Subject: Re: [WiX-devs] The Great GitHub Discussion
On 2/6/2014 3:43 PM, Rob Mensching wrote:
More importantly, I think separate repos would follow the typical dev work flow
better where master is the latest version and other branches support the master
or the next version.
On the various projects I've worked on, trunk/head/master has always been the
latest in-development code, with branches for releases and bug fixes. People on
http://stackoverflow.com/questions/153812/subversion-is-trunk-really-the-best-place-for-the-main-development
seem to agree, but maybe since it's about SVN it's outdated nowadays?
--
Bruce
NOTICE: This electronic mail message and any files transmitted with it are
intended
exclusively for the individual or entity to which it is addressed. The message,
together with any attachment, may contain confidential and/or privileged
information.
Any unauthorized review, use, printing, saving, copying, disclosure or
distribution
is strictly prohibited. If you have received this message in error, please
immediately advise the sender by reply email and delete all copies.
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
