[GEM-dev] help files update - git

[IOhannes m zmoelnig]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2011-12-07 14:45, Nicolas Montgermont wrote:
> ok, is there any way of making a pull request? Or must we send a mail to
> this list when something is ready?

there should be a possibility to make a pull request via github.
else, just write an email.


>> The Linux-style flow here is that the git forks should rebase to be on
>> the HEAD of the main git before submitting the changes.
>>
> I am not sure to understand.

that's basically just a way to ensure minimal work for the merger (me
:-)), by making sure that master and the forked branch are "as close as
possible" - and don't have conflicts.

> For example if i am in my local repo in my forked branch i want to
> submit (gem sourceforge is called origin here), i must do
> git pull --rebase origin

just do:
$ git checkout -b help-patch
[...]
$ git commit
$ git checkout master
$ git pull origin
$ git checkout help-patch
$ git rebase master
$ git checkout help-patch
$ git push


this can quickly get tiresome if you pushed your branch to a public
repository before doing the rebase (because you may need to delete the
remote branch before you can push the rebased version)

however, this could be a rather theoretical problem for us...rebasing to
current master is important for resolving conflicts; as long as there
are no conflicts, it doesn't really matter.

fgamsdr
IOhannes
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk7fct0ACgkQkX2Xpv6ydvTArgCgpDOzqboTakq1Cdisln69dqsf
CwoAoN+R1qAh+L8HRFvAB0EeBnh88iD7
=/SSN
-----END PGP SIGNATURE-----

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3636 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.puredata.info/pipermail/gem-dev/attachments/20111207/f8d6bb4d/attachment.bin>