Re: [X2go-Dev] Upgrading our git branches to NX 3.5

On Wed, Jun 29, 2011 at 21:02:39 (CEST), Mike Gabriel wrote:

Hi Reinhard,

On Mi 29 Jun 2011 16:52:47 CEST Reinhard Tartler wrote:

...

Hi,

I've started to upgrade the git branches on code.x2go.org to 3.5. So far I've completed:

• nxcomp
• nxcompext
• nxcompshad
• nxproxy

There is nothing there yet... Could you push your changes to code.x2go.org (into a branch first)?

! [remote rejected] master -> master (hook declined)

For this task, I had to do merges. At the time we've discussed the hooks, we didn't anticipate that there would be future code drops fron nomachine. However, this has changed. Therefore, please disable the merge checks for these four branches.

Cheers, Reinhard

-- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4