[X2go-dev] Build-Server / openSuse Build Service

[Mike Gabriel]

Hi Reinhard,

On Sa 30 Apr 2011 07:39:57 CEST Reinhard Tartler wrote:

> On Fri, Apr 29, 2011 at 22:24:43 (CEST), Mike Gabriel wrote:
>
>
> [...]
>
>>> AFAIUI this 'build-main' tag as you propose is a moving target that is
>>> deleted and recreated every then and when. To me, this seems confusing.
>>
>> Yes, indeed it is a moving target. Here I think, that it can be a
>> matter of documentation working against confusion.
>
> why not using a branch instead of a tag?

also possible. The only problem I see is that the Git server currently  
does not (by policy) accept merge commits.

What command sequence would you suggest to update the content of a  
build-main branch (e.g. with commits from master) without conflicting  
with merge commits? (I certainly do want to avoid cherry-picking into  
the build-main branch. It shall be as simple approach...

e.g.

ssh <server> { cd </path/to/git/project>; git branch -D build-main; }
git branch -D build-main
git checkout -b build-main <REF>
git push origin build-main

???

Greets,
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/20110430/ea32d414/attachment.pgp>