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 branches are
not, in reality, completely independent, and work on one can affect
Thanks Magnus. That's really reassuring to know that I'm not missing
that point and branches aren't necessarily easy. I do use merging, but
avoiding dependencies might result in so much merging that there is no
point in having separate branches. It's a good point about there being
trade-offs to consider.
BTW, I'm familiar with the diagram from nvie.com, but it doesn't
answer this problem - its feature branches are completely
independent until merged into the develop branch. In my experience
the world is not that neat and tidy.
I'd appreciate any advice.
With the risk of sounding a bit patronising it seems you've forgotten
the other side of the coin -- merging.
If, and this is a big if, your changes to your work on the home page
template file is contained in self-contained patches, then you can
merge those changes from 'memlogin' to 'adverts'.
If that's not possible you might be facing the risk of having to
progressing 'memlogin' to a point where it can be deployed. Merge it
into 'master' and then restart 'adverts' from there.
I think feature branches are the bee's knees too, but they aren't as
easy as in all the examples one reads -- they require some up-front
thinking. In particular it's problematic when dependencies between
features emerge during development. In essence you then only have two
options, finish them in order of dependency, A then B, or don't. If
you don't you'll probably end up hacking up certain aspects of B just
to make it good enough, then when A is finished you can revisit B.
Unfortunately not an answer to "What should I do?" Because that's
really only an answer you, or your project manager, can answer. But
hopefully it aids in thinking about the trade-offs of your options.
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.