[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CG manual, pushing to staging
|
From: |
James Lowe |
|
Subject: |
Re: CG manual, pushing to staging |
|
Date: |
Sun, 19 Jul 2015 08:16:10 +0100 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hello
On 18/07/15 18:47, David Kastrup wrote:
> Benkő Pál <address@hidden> writes:
>
>> 2015-07-18 17:57 GMT+02:00 Federico Bruni <address@hidden>:
>>> What do you think about these instructions?
>>> http://lilypond.org/doc/v2.19/Documentation/contributor/pushing-to-staging
>>>
>>>
>>>
>>>
I have a few comments, but I'm not sure about any of them:
>>>
>>> 1. There's no real purpose in pulling and rebasing the staging
>>> branch, assuming that this branch should be "clean" (we should
>>> work on master or on a local branch).
>>
>> agreed: I don't need a local master or staging branch at all.
>> all my branches are based on origin/master;
>
> That's my usual way of operation as well. However, I used a local
> master branch
...
Also don't forget about the 'lily-git.ticklers' (lily-git.tcl!) like
me;and the 'Patchy people' (like me) as we'll have a
'dev/local_working' branch kicking about and possibly a test-staging,
test-master branch or two as well.
Just in case we're making changes based on the assumption that there
is a 'best' way to use git with LilyPond and then the CG ends up
contradicting what these tools do when they are used.
:)
James
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBAgAGBQJVq061AAoJEP8yVoKoS9i+5n0QAMkB28MxtTJxTd3IArroHXvd
TIgDvVxNs32i6VPJd5JHNWTa1477I0sn/bu0+eoqFB92rQZaUjKjYLaZ6LM5KpzW
xIzlUqMrOqw8Dcldu9UiU0EeeWz+BsDuU/8g0UgzfwC9uahY/Dl44w1HaPB28iWh
mVQsw8hRuFRolLvdTxTZT4cvNLbbHWqe3NWpzRZzXY5pvdNShCQ9qia9+Ejia3tF
eWpJ4TO1h7EttBa23UfO707dXMDFCrZHuup6MmMNxapA631PD9TElUxsqxiqQujx
4UwA2rfdDI/ltKD7QDYwG/1OG+5lOnpwMqrw+HQqoU/gPEoL3LciIM+ZFiszYPpz
2PmcH9Izw+xywnvuOBZCozcrKl9odlb7gmAsqrk9Z523oHB9zIttN7ThrcIyProE
ZkxqD5GkhXwaEV7CWS2gXJ8YV7vaMddyzAafA8NiJw7tvH8y42rsHyobmeeDhbfS
mjw8GFAF6zMnmhV/Yjy2ZLry/G6KrtCZv13apNWW7hJC5aQVwr52Fb/Yie+dWX/V
9/0SWGdA2G/9IEPAtrR8tukxrNJz2RrRSdpcLLHfTu2fdVxz3XX/Ykb/iwQFg155
GdglEIf7PIcjukNLTc1FmiJaiw8hKeTlsag/Dkjim1PUfMG8LbK2OVaNtBB/YODV
84lH+BiJ+18sGoiuOM3W
=7PEF
-----END PGP SIGNATURE-----