[Opendnssec-develop] Move to git

Yuri Schaeffer yuri at nlnetlabs.nl
Thu Feb 6 09:48:48 UTC 2014


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

> You do not need to make a pull request to fix the broken code
> because it should not be broken in the first place thanks to this
> workflow and ALL the tests we do.

I admire your optimism. :)
However you don't give me a choice other than to quote one of Murphy's
laws: "If you make something idiot proof, someone will just invent a
better idiot."

> Best way to learn git is to use git and you really need to use it
> to understand it.

Yes I see that now. Would you say the following art describes our
workflow accurate?

         develop ----> master
        ^   |   ^
        |   |   |       ( upstream )
________|___|___|________
        |   |   |
    feat1   |   feat2   ( origin )
    ^       |       ^
____|_______|_______|____
    |       |       |
    |       V       |   ( local )
    |    develop    |
    |   |       |   |
    |   V       V   |
    feat1       feat2

I.e. I need not maintain the develop branch in origin. And if I do I
whould pull upstream to local and then push it to origin? (which might
be a good idea when working on multiple machines)

- -- 
Composed on an actual keyboard: all typos genuine.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Icedove - http://www.enigmail.net/

iEYEARECAAYFAlLzWn8ACgkQI3PTR4mhavjzDACeJTs3+gsWlb8vE/T5xwZuvupp
ATEAoMOFDGnnbOrtHG89fr8vnIC7DkRV
=qD8d
-----END PGP SIGNATURE-----



More information about the Opendnssec-develop mailing list