[Cialug] git in structured environment
aaron.korver at gmail.com
Thu Jul 10 22:38:09 CDT 2008
Actually Jeffery, I have to disagree with you. SVN just came out with the
new 1.5 version of the software. Now granted, it wasn't a feature from the
start, but now it does track the merges between branches. It also added the
feature to shelf code until the developer is ready to check in. So the SVN
developers have been seeing what Git is doing and trying to improve SVN.
On Thu, Jul 10, 2008 at 1:53 PM, Jeffrey Ollie <jeff at ocjtech.us> wrote:
> On Thu, Jul 10, 2008 at 12:45 PM, Lathrop Preston
> <lathrop at prestonfam.org> wrote:
> > Git might be useful however I think that
> > the "normal" VCS system is much more suited to a developer shop model. We
> > have developers, designers, and "production" people all working against
> > common code bases. The Git model just seems to complicate the VC compared
> > say SVN if you are using it right. I can see how it might be useful in a
> > distributed setup (still a bit wary) but the number of merges & conflicts
> > that Git seems inclined to generate would be a pain in your average shop.
> *Git* doesn't generate conflicts. For that matter neither does CVS,
> Subversion, Mercurial, Bazaar, Darcs, or whatever other VCS you can
> come up with.
> *Developers* generate conflicts. Developers generate conflicts when
> two or more people edit the same sections of code. What separates
> VCSs is how good the VCS is at helping developers resolve those
> conflicts. CVS and Subversion SUCK at this. The distributed VCSs do
> much much better jobs at helping developers resolve the conflicts
> because they keep track of the merges as well as the branches and use
> that information to resolve conflicts. And before you say that CVS
> and Subversion don't have this problem, they do - you just don't
> realize it. CVS and Subversion effectively force you to merge your
> local changes to the central repository on every commit and prevent
> you from committing unless there are no conflicts. Distributed VCSs
> let the developer delay the need to merge until a time that is more
> convenient to them.
> I happen to believe that Git is one of the best tools out there for
> managing source code, no matter the size of your shop. The other
> distributed VCSs do a good job too and may suit you better.
> Cialug mailing list
> Cialug at cialug.org
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Cialug