[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Shared branch vs single branch

From: Edwin Castro <0ptikGhost_at_gmx.us>
Date: Mon, 23 Sep 2013 15:37:17 -0700

On 9/23/13 1:45 PM, Les Mikesell wrote:
>> "Trunk is dirty" won't save you from bad merges, it'll just make more
>> > conflicts in your working copy as you do updates - something that drove a
>> > colleague of mine nuts so I started working in my own branch for that
>> > project. You also have to more frequently be doing "svn update" on your
>> > working copy to minimize impacts of what others are doing.
> Just a matter of whether you want to resolve small conflicts as they
> happen with frequent updates/commits (and maybe take advantages of
> other's changes sooner rather than later), or do you want to complete
> the changes in isolation so you can prove that your version was the
> best and should win if there is a conflict?

The isolation provided by branches can result in code that diverges
greatly because the child branch is not kept in sync with its parent.
Large time periods of isolation can cause some very hairy merges.
Received on 2013-09-24 00:38:02 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.