[X2go-Dev] X2go development workspace

[Moritz Struebe]

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

Cheers
Morty



-- 
Dipl.-Ing. Moritz 'Morty' Struebe (Wissenschaftlicher Mitarbeiter)
Lehrstuhl für Informatik 4 (Verteilte Systeme und Betriebssysteme)
Friedrich-Alexander-Universität Erlangen-Nürnberg
Martensstr. 1
91058 Erlangen

Tel   : +49 9131 85-25419
Fax   : +49 9131 85-28732
eMail : struebe at informatik.uni-erlangen.de
WWW   : http://www4.informatik.uni-erlangen.de/~morty




-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4482 bytes
Desc: S/MIME Kryptografische Unterschrift
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20110614/9920c7e0/attachment.bin>