[X2go-Dev] X2go development workspace

[Mike Gabriel]

Hi Morty,

On Di 14 Jun 2011 17:14:33 CEST Moritz Struebe wrote:

> On 2011-06-14 16:48, Mike Gabriel wrote:
>>
>> Here is the link...
>> http://wiki.x2go.org/development-workspace
>>
>
> Hi,
>
> from my little experience I'd suggest always working on a branch, and
> rebase against master. That way you can easily clean up things, or don't
> have to worry about merges. To my experience using git pull when having
> local commits on master isn't such a good Idea. Rather do "git fetch",
> and then "rebase origin/master".

This sounds like a good solution. Could you incorporate that in the  
wiki page. Maybe as another/preferred option first, so we collect  
things first before we drop them?

Thanks,
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/20110614/1f2cb06b/attachment.pgp>