On the use of Git

Peter Van Eynde pvaneynd at mailworks.org
Mon Sep 13 19:22:28 UTC 2010


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hello Desmond,

Thanks for your comments!

On 11/09/10 11:26, Desmond O. Chang wrote:
> There are too many branches.  We should use tag for each version.  The
> 'patch' and 'typo' branches are both unnecessary.  Using one
> 'packaging' branch is ok.  If you want to pick only a few patches from
> the previous version, you can use 'cherry-pick'.

Unless I'm mistaken you can only cherry-pick into a new branch, or when
you are rebasing.

As the master branch would be publicaly available this would ruin the
work of anybody who was working on master or a branch of master.

Not?

> 
> This is my workflow:
> 
>  --U1-------U2-------U3->upstream
>     \        \        \
>      D1-1     D2-1-----D3-1->master
>       \       /
>        D1-2--/
> 

So I started working on master at 'D1-2' what will happen if I 'pull'
the branch again from alioth?

(Honestly I prefer your way, but this seems difficult in a distributed
development architecture)

Best regards, Peter
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJMjnnyAAoJEB4VNT76eIlaYfQP/2D0wvSCznKVgdOucjNowKpN
yeFIAITevR7sZ8fm50IGtCIqtZaQtpPcVcofuyivBb8t0KggfjIKsf0qOdi12S+e
fxan8TXjyfxEoANZJEDb7y4wgY/dqegjgN2GsmYtLCSmowqbLoDE2K9KQvQMDsqf
v0StinHkXrQppWs1LcYGuMQRqh0gIhuaN2jZVOJfnxqCyVLq19nYcIsJ3XqZOaY9
LTFDKY1xZzs9mmufPIH5ktG46miIKUArj66EZa27pzoPion+B3Ey1mPrMOArN1NU
rMt7YO6OjmNRLlx4Asr0jMfZRZgouXWV9M2KkgvjSYL6tWRsUYNIOcZeTfF6KpJu
ornXJgtFVL2XBZdB/Dy0Iu20edxc+NflM/sWPe1MMQrx/KC8whSS4d3Cdg4HaoBr
F6fzMlnY5Orvj65ZWdSxRE/255eiBiLok9uAsOJTd29DqR9tD24k2g9bx3lsKrnG
mz77tr49mzA+bukTm9zfH+YaRXFBgLLNJEH0DB24KHfgvq0tE9Zn2g88DIznFYA7
//kyhmz2CBuW21UnV5AwmU7XE5o1HBdhl6QYS6y8Ax4WXJJy2J8jKDKPEgPP48//
kIzWC/yNQgWp2SVIaJb8CG0tZgZ5FOLANlW4iXW0WDv+IC1qXGZnOrNEh1mpl+YG
KQr6JXGB6i2p3brKorcT
=ahPz
-----END PGP SIGNATURE-----



More information about the pkg-common-lisp-devel mailing list