On 9/23/13 1:04 PM, C M wrote:
> But coming back to my original question: Are there any potential gotchas with
> using a single/shared branch? For now, that's the only change the team (and
> leadership) is looking to as the "solution".
In my opinion there isn't a single answer to this question.
> From: C M [mailto:cmanalys...@gmail.com]
> Sent: Monday, September 23, 2013 4:05 PM
> To: Les Mikesell
> Cc: Bob Archer; Subversion
> Subject: Re: Shared branch vs single branch
>
> Unfortunately, we are lacking on processes and there's a definite lack of
> pro
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 m
On 9/23/13 1:15 PM, BRM 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 d
On 9/23/13 1:04 PM, C M wrote:
> The idea of turning over merging to them seems to be a recipe for
> disaster.
IMHO, merges should be performed by the individual who is most
knowledgeable of the code being merged. When conflicts occur, and they
WILL occur, the individual performing the merge will
On Mon, Sep 23, 2013 at 3:15 PM, BRM wrote:
> If by "single/shared" branch you mean everyone working out of the same
> place...then yes - you'll trip over each other from time to time.
Conflicts are going to happen. The question is more about the timing
- and how your team works (or fights...) t
> What are some of the pros/cons of using a single/shared branch versus the
> private developer branch?
> We are having an internal debate within the team where the idea of a
> single/shared branch was proposed in reaction to two specific issues:
> 1. In the merge to trunk from individual develope
_
From: C M
To: Les Mikesell
Cc: Bob Archer ; Subversion
Sent: Monday, September 23, 2013 4:04 PM
Subject: Re: Shared branch vs single branch
Unfortunately, we are lacking on processes and there's a definite lack of
product management.
But coming back to my
On Mon, Sep 23, 2013 at 2:35 PM, Bob Archer wrote:
>> On Mon, Sep 23, 2013 at 1:50 PM, Bob Archer wrote:
>> >> It really depends. I think all work for a specific release should be done
>> >> in a
>> single branch/folder. Many people follow the stable trunk model. In this
>> model
>> you general
Unfortunately, we are lacking on processes and there's a definite lack of
product management.
But coming back to my original question: Are there any potential gotchas
with using a single/shared branch? For now, that's the only change the team
(and leadership) is looking to as the "solution".
Our
> On Mon, Sep 23, 2013 at 1:50 PM, Bob Archer wrote:
> >> It really depends. I think all work for a specific release should be done
> >> in a
> single branch/folder. Many people follow the stable trunk model. In this model
> you generally do all work on trunk and then branch for a release. This i
On Mon, Sep 23, 2013 at 1:50 PM, Bob Archer wrote:
>> It really depends. I think all work for a specific release should be done in
>> a single branch/folder. Many people follow the stable trunk model. In this
>> model you generally do all work on trunk and then branch for a release. This
>> is
On 23.09.2013 19:44, C M wrote:
> What are some of the pros/cons of using a single/shared branch versus
> the private developer branch?
>
> We are having an internal debate within the team where the idea of a
> single/shared branch was proposed in reaction to two specific issues:
>
> 1. In the merg
What are some of the pros/cons of using a single/shared branch versus the
private developer branch?
We are having an internal debate within the team where the idea of a
single/shared branch was proposed in reaction to two specific issues:
1. In the merge to trunk from individual developer branche
14 matches
Mail list logo
