Re: [Gimp-web] New Workflow

[Michael Schumacher <schumaml gmx de>]

On 16.07.2014 23:32, Pat David wrote:
> Hi all!
>
> So, should we be pushing changes to wgo into "Testing" now (I believe that
> should be correct)?  Also, do the changes pushed into testing get pushed
> into master at some point?  How is this triggered at the moment?
>
> I'm getting ready to start updating a few more tutorials, but want to make
> sure I'm pushing the changes to the right place...

The point of the testing branch - built automatically to
http://testing.gimp.org every five minutes - is to be able to view
changes online and fast and not touch the production environment, that
is http://www.gimp.org

There aren't many rules and processes around this (more and more people
almost seem to insist that we add rules and processes around each and
every aspect of the GIMP project).

So this is really just to address the challenges of "I want to see my
change without having a full gimp-web build setup locally" and "what
happens if I change this, will it break www.gimp.org?".

As such. moving any change from the testing branch to the master branch
- built to http://www.gimp.org every 15 minutes - is just a merge from
the testing to the master branch.

See
http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merging
for the principle for merging branches in Git.

We haven't got any procedures in place to decide whether some content
should be in www.gimp.org or not.


-- 
Regards,
Michael
GPG: 96A8 B38A 728A 577D 724D 60E5 F855 53EC B36D 4CDD