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 : [email protected] WWW : http://www4.informatik.uni-erlangen.de/~morty
smime.p7s
Description: S/MIME Kryptografische Unterschrift
_______________________________________________ X2go-Dev mailing list [email protected] https://lists.berlios.de/mailman/listinfo/x2go-dev
