You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@marmotta.apache.org by Sergio Fernández <se...@salzburgresearch.at> on 2013/11/03 08:22:39 UTC

Re: branching workflow

Hi,

On 31/10/13 23:31, Peter Ansell wrote:
>> On 31 Oct 2013 09:36, "Sergio Fernández"wrote:
>>
>> (...) we are considering only releases as stable code.  And I think
>> we should do that more often.
>
> GitFlow is a well known and accepted distributed VCS strategy [1].
> Rather than changing that strategy, potential developers who want to
> work with the codebase should be learning it (and the other main Git
> workflows [2]) as a Git exercise. They are likely to need to use it or
> similar workflows on other open source projects in the future.

So, it I understood correctly, according GitFlow we are doing right 
considering stable code (so merging to master) only releases, is that 
correct?

If we all agree, that's fine for me. We'd just need to update the 
documentation. And, of course, be aware all team of such workflow. After 
all, we are learning in the trip :-)

Thanks Peter for the clarification.

Cheers,

-- 
Sergio Fernández
Senior Researcher
Knowledge and Media Technologies
Salzburg Research Forschungsgesellschaft mbH
Jakob-Haringer-Straße 5/3 | 5020 Salzburg, Austria
T: +43 662 2288 318 | M: +43 660 2747 925
sergio.fernandez@salzburgresearch.at
http://www.salzburgresearch.at

Re: branching workflow

Posted by Sergio Fernández <se...@salzburgresearch.at>.
On 08/11/13 15:28, Andrea Di Menna wrote:
> I am getting a 404 on this URL.

That happens while the CMS is re-building the staging site because new 
changes are coming. And just now Sebastian is pushing new documentation 
there, so it might be temporally unavailable while rebuilding.

For avoiding those issues, the new site has been already published, so 
you can access the content at:

   http://marmotta.incubator.apache.org/development.html

Hope this has clarified the issues.

Cheers,

-- 
Sergio Fernández
Senior Researcher
Knowledge and Media Technologies
Salzburg Research Forschungsgesellschaft mbH
Jakob-Haringer-Straße 5/3 | 5020 Salzburg, Austria
T: +43 662 2288 318 | M: +43 660 2747 925
sergio.fernandez@salzburgresearch.at
http://www.salzburgresearch.at

Re: branching workflow

Posted by Andrea Di Menna <ni...@gmail.com>.
Hi,

I am getting a 404 on this URL.

Cheers
Andrea


2013/11/8 Sergio Fernández <se...@salzburgresearch.at>

> Hi,
>
> I spent some time updating the development documentation to better reflect
> the gitflow Marmotta is following. Please, take a look at the staging site:
>
>   http://marmotta.staging.apache.org/development.html
>
> Feedback would be welcomed ;-)
>
>
> Cheers,
>
> --
> Sergio Fernández
> Senior Researcher
> Knowledge and Media Technologies
> Salzburg Research Forschungsgesellschaft mbH
> Jakob-Haringer-Straße 5/3 | 5020 Salzburg, Austria
> T: +43 662 2288 318 | M: +43 660 2747 925
> sergio.fernandez@salzburgresearch.at
> http://www.salzburgresearch.at
>

Re: branching workflow

Posted by Sergio Fernández <se...@salzburgresearch.at>.
Hi,

I spent some time updating the development documentation to better 
reflect the gitflow Marmotta is following. Please, take a look at the 
staging site:

   http://marmotta.staging.apache.org/development.html

Feedback would be welcomed ;-)

Cheers,

-- 
Sergio Fernández
Senior Researcher
Knowledge and Media Technologies
Salzburg Research Forschungsgesellschaft mbH
Jakob-Haringer-Straße 5/3 | 5020 Salzburg, Austria
T: +43 662 2288 318 | M: +43 660 2747 925
sergio.fernandez@salzburgresearch.at
http://www.salzburgresearch.at

Re: branching workflow

Posted by Sergio Fernández <wi...@apache.org>.
Apologize if someone consider this marketing, but I find it relevant for 
this thread: on Thursday November 21st Atlassian is organizing a 
webinar about git branching for agile teams: http://ow.ly/qtXEp
Looks interesting; I hope to have time to attend it.

On 03/11/13 08:22, Sergio Fernández wrote:
> Hi,
>
> On 31/10/13 23:31, Peter Ansell wrote:
>>> On 31 Oct 2013 09:36, "Sergio Fernández"wrote:
>>>
>>> (...) we are considering only releases as stable code.  And I think
>>> we should do that more often.
>>
>> GitFlow is a well known and accepted distributed VCS strategy [1].
>> Rather than changing that strategy, potential developers who want to
>> work with the codebase should be learning it (and the other main Git
>> workflows [2]) as a Git exercise. They are likely to need to use it or
>> similar workflows on other open source projects in the future.
>
> So, it I understood correctly, according GitFlow we are doing right
> considering stable code (so merging to master) only releases, is that
> correct?
>
> If we all agree, that's fine for me. We'd just need to update the
> documentation. And, of course, be aware all team of such workflow. After
> all, we are learning in the trip :-)
>
> Thanks Peter for the clarification.
>
> Cheers,
>

-- 
Sergio Fernández
Senior Researcher
Knowledge and Media Technologies
Salzburg Research Forschungsgesellschaft mbH
Jakob-Haringer-Straße 5/3 | 5020 Salzburg, Austria
T: +43 662 2288 318 | M: +43 660 2747 925
sergio.fernandez@salzburgresearch.at
http://www.salzburgresearch.at