Hi Alex,
as requested I have composed a first draft of a
X2go development workspace
wiki page. Please take a look at give feedback, make modifications
where needed, ask questions where unclear...
Here is the link... http://wiki.x2go.org/development-workspace
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@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
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@informatik.uni-erlangen.de WWW : http://www4.informatik.uni-erlangen.de/~morty
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@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
-
Mike Gabriel -
Moritz Struebe