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

[Mike Gabriel]

On Do 30 Jun 2011 16:37:14 CEST Reinhard Tartler wrote:

>> 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.

try now... After your pushes can I revert to non-merge commits only or  
do we have to keep the merge option enabled?

Mike

-- 

DAS-NETZWERKTEAM
mike gabriel, dorfstr. 27, 24245 barmissen
fon: +49 (4302) 281418, fax: +49 (4302) 281419

GnuPG Key ID 0xB588399B
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digitale PGP-Unterschrift
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20110630/d90f7b72/attachment.pgp>