public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: gitlist <gitlist@myword•co.uk>
To: git@vger•kernel.org
Subject: Re: Branching strategies
Date: Mon, 19 Sep 2011 19:51:01 +0100	[thread overview]
Message-ID: <4E778F15.9050705@myword.co.uk> (raw)
In-Reply-To: <CAH5451kn5WD4+S3_SGMarGyoUs6NA6Xvz9Pb8Wdpt9v0nY+Uow@mail.gmail.com>

On 10/09/2011 02:18, Andrew Ardill wrote:
> On 10 September 2011 09:01, robert mena<robert.mena@gmail•com>  wrote:
>> Hi,
>>
>>  <snip>
>> Since some of those can touch the same files how can I make this a
>> little bit better (manageable)?
>>

> A very interesting read is
> http://nvie.com/posts/a-successful-git-branching-model/
>
> It may not be perfect for you, however it does discuss some very
> interesting issues, particularly how workflow is just as important as
> the branching model.


I came across the nvie post some time and it was very useful, but it 
doesn't address handling of feature branches, especially where there is 
overlap.

I have a website where people can register. They can also buy things. If 
they haven't registered when they come to checkout, the checkout process 
includes registration. Users can also create "sponsorship" pages where 
they ask friends to sponsor them in a marathon etc. If someone setting 
up a sponsorship page is not already registered, it's included in the 
process.

So there are three strands (to avoid using the word "branch") - 
registration, buying, and sponsorship - which end up affecting the same 
bits of code. Registration was done a year ago but recently needed 
updating; buying was started some months ago but got held up; 
sponsorship started recently, has been completed, and has "overtaken" 
buying.

How should I use branches in this scenario? Or if I've got the concept 
wrong, how should I change my workflow?

Thanks

Roddie Grant

next prev parent reply	other threads:[~2011-09-19 19:21 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-09 23:01 Branching strategies robert mena
2011-09-10  1:18 ` Andrew Ardill
2011-09-19 18:51   ` gitlist [this message]
2011-09-20  0:12     ` Andrew Ardill
2011-09-15 11:07 ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4E778F15.9050705@myword.co.uk \
    --to=gitlist@myword$(echo .)co.uk \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox