Re: branching workflow

2013-11-08 Thread Andrea Di Menna
Hi, I am getting a 404 on this URL. Cheers Andrea 2013/11/8 Sergio Fernández > 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.

Re: branching workflow

2013-11-08 Thread Sergio Fernández
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 avoidin

Re: branching workflow

2013-11-08 Thread Sergio Fernández
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 Know

Re: branching workflow

2013-11-05 Thread Sergio Fernández
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 wrot

Re: branching workflow

2013-11-03 Thread Sergio Fernández
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, po

Re: branching workflow

2013-10-31 Thread Peter Ansell
On 1 November 2013 04:00, Jakob Frank wrote: > On 31 Oct 2013 09:36, "Sergio Fernández" < > sergio.fernan...@salzburgresearch.at> wrote: >> >> what we are misunderstanding here in the concept of "stable code". > Besides the wrong merge Sebastian did (see INFRA-6876), we are considering > only rele

Re: branching workflow

2013-10-31 Thread Jakob Frank
On 31 Oct 2013 09:36, "Sergio Fernández" < sergio.fernan...@salzburgresearch.at> wrote: > > what we are misunderstanding here in the concept of "stable code". Besides the wrong merge Sebastian did (see INFRA-6876), we are considering only releases as stable code. And I thing we should do that more

Re: branching workflow

2013-04-12 Thread Jakob Frank
No git-expert here either - but i just observed the following: jakob@X201:~/workspaces/marmotta/marmotta$ git fetch ... a12b381..8e87a83 master -> origin/master * [new branch] develop-> origin/develop >From https://git-wip-us.apache.org/repos/asf/incubator-marmotta * [new tag]

Re: branching workflow

2013-04-12 Thread Andy Seaborne
On 12/04/13 07:55, Sergio Fernández wrote: Any expert on git in the room? I thin we have a problem understanding the tagging system. According the documentation: when "git fetch" is run, unless told otherwise by an explicit --no-tags, it automatically fetches tags that point at new commits on br

Re: branching workflow

2013-04-12 Thread Sergio Fernández
Another thing is I'd like to discuss to avoid the usage of "git pull". Basically this is the same than "git fetch && git merge", I have read many articles explaining saying why 'git pull' is evil!, for example https://coderwall.com/p/jgn6-q , explaining the mess "git merge" could cause, recomm

Re: branching workflow

2013-04-11 Thread Sergio Fernández
Any expert on git in the room? I thin we have a problem understanding the tagging system. According the documentation: when "git fetch" is run, unless told otherwise by an explicit --no-tags, it automatically fetches tags that point at new commits on branches you fetch. But this does not wor