On 22/05/2013 20:24, Magnus Therning wrote:
On Wed, May 22, 2013 at 08:02:50PM +0100, Roddie wrote:
I'm fine with Git and branches when it's simple, but as soon as
things get a little complicated, I get baffled and frustrated.
This is just an example. The general point is about how branch
On 23/05/2013 01:06, Yawar Amin wrote:
Hi,
On Wednesday, May 22, 2013 3:02:50 PM UTC-4, Roddie wrote:
[...]
That work is on hold because I have to get adverts on the home page,
and
I've made a new branch - "adverts". This was branched from the master
branch, so does not inc
Hi,
Ok with your change to the GitFlow process in step 3 you'll have to be
careful about doing that merge back to master in step 4, in fact I'd say
just don't do it. The reason is that you'll be diverging mater from develop
and it'll soon become difficult if not impossible to manage and I woul
Yes it really is a decision about the size of the project, the complexity
of the features, the dependencies between those features etc. So
essentially *Feature Branching* won't fit every situation and I think
branching in general is more of a tool than a necessity and I think it
becomes a skill
Thanks Alex - that's good to hear. In another thread I've just come
across the concept of "feature toggle" and I'm wondering if that might
be more appropriate for me.
Roddie
On 23/05/2013 11:01, Alex Lewis wrote:
Yes it really is a decision about the size of the project, the
complexity of the
Yeah Feature Toggles can be a useful approach and like feature branches it
sounds great on the outset but in my opinion like feature branches it comes
with caveats when using it in reality, like anything the devil is in the
details. Also Feature Toggles are described as an alternative to Feature
Hi Yawar,
I'm more inclined to say everyone was right in their own way ;-)
My first part of the question was asking if the shell itself changed the
character, and that was 'No', the dot character is passed to the executable.
[this compares to say blob expansion where the shell does change the c
Hi,
On 2013-05-23 15:33, Philip Oakley wrote:
> [...]
> I did find part of the documentation hidden in git config as a special
> case for defining a remote, but the command line effect hadn't been
> noted. So I've submitted a documentation patch for comment to the main
> list.
Indeed, it's set of
Thanks guys,
I think we have decided that we are going to stick to the nvie gitflow way
of doing things more closely and that we are simply going to put policies
in place to ensure only stuff we want in production gets into develop.
All unfinished work will just remain in feature branches.
Thank