Re: [Gimp-web] New Workflow

2014-07-17 Thread Pat David
Ah, that's the trick. Just need to merge to master from testing. (Which I will now go and learn more about before I break something). I was just wanting to make sure someone was able to check what I was doing before merging my changes to master. If you trust me to do it, I have no problem doing

Re: [Gimp-web] New Workflow

2014-07-16 Thread Michael Schumacher
On July 17, 2014 5:01:21 AM CEST, scl wrote: >However, something is failing here. Three days ago I pushed a >correction >to the testing branch. They and Pats commit 10 hours ago are not in >the master branch yet. There is no recent merge in the gimp-web master branch log, so I guess either n

Re: [Gimp-web] New Workflow

2014-07-16 Thread scl
Hi, On 17.7.2014 at 3:33 AM Michael Schumacher wrote: 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 [..] So this is really

Re: [Gimp-web] New Workflow

2014-07-16 Thread Michael Schumacher
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 sta