On Fri, Aug 8, 2014 at 12:27 PM, Rohit Yadav wrote:
> Hi Daan,
>
> On 08-Aug-2014, at 12:05 pm, Daan Hoogland wrote:
>
>> Rohit,
>>
>> A remark and a question:
...
>> Why insist on fast-forward? (In the git-flow document it is emphasised
>> that --no-ff should be used at all times)
>
> So, in my
Hi Daan,
On 08-Aug-2014, at 12:05 pm, Daan Hoogland wrote:
> Rohit,
>
> A remark and a question:
> I would say merge and if not applicable cherry-pick. (to be sure that
> the optimal solution is used)
+1
> Why insist on fast-forward? (In the git-flow document it is emphasised
> that --no-ff sh
git.git workflow is a logical superset of gitflow with shorter branch names.
All the basic practices are the same. Unsurprisingly, perhaps :-)
The key difference is the use of long lived stable branches rather than
per-release stable branches that wither & die off.
I would guess it’s a little e
Rohit,
A remark and a question:
I would say merge and if not applicable cherry-pick. (to be sure that
the optimal solution is used)
Why insist on fast-forward? (In the git-flow document it is emphasised
that --no-ff should be used at all times)
thanks, and thanks for seeing the first step to free
Another note on this blog/workflow/idea:
Say I’ve a bug for multiple ACS releases, the way our workflow should be to fix
it on the earliest ACS release branch we want to support and then to the next
ones, finally on master and then feature/personal branches. Example, you fix on
4.1, then cherry
Hi Daan,
On 08-Aug-2014, at 10:25 am, Daan Hoogland wrote:
> And another thank you:
>
>
> Long-running release branches for long-term support
>
> What are the main long-running branches in this model?
>
> We have a master branch – which in Subversion (SVN) terms you would
> call trunk – that is
And another thank you:
Long-running release branches for long-term support
What are the main long-running branches in this model?
We have a master branch – which in Subversion (SVN) terms you would
call trunk – that is stable-ish. It is in a alpha/RC state.
We have stable release branches for e
