[X2go-Dev] Upgrading our git branches to NX 3.5
siretart at tauware.de
Thu Jun 30 17:01:35 CEST 2011
On Thu, Jun 30, 2011 at 16:56:36 (CEST), Mike Gabriel wrote:
> 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?
I'd say let's allow merges for these four repos only. You seen to want
to get rid of them anyway.
Reinhard Tartler, KeyID 945348A4
More information about the x2go-dev