[Opendnssec-develop] Move to git

Yuri Schaeffer yuri at nlnetlabs.nl
Tue Feb 4 10:39:08 UTC 2014


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

> I don’t see why you can’t make a branch for that bug fix, fix it
> and make a pull request for that and then continue with your
> feature (which is in a different branch ofc).

Yes but you advised me against merging the bug fix to my other
branches (or just develop?). So how can I use 'feature' and 'bugfix'
simultaneously?

Imagine -for argument sake- the bugfix is for "ODS does not compile".

My impression of Git was that each commit can be uniquely identified.
Thus applying commits to multiple branches and then merging them does
not cause conflicts [for those commits]. But that is not true?

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

iEYEARECAAYFAlLww0wACgkQI3PTR4mhavg0agCgwZizvsACPtwJovJZKtIckUR9
rhsAoKn6jpZdv1o6saKnXcyyXftTbT0w
=44t6
-----END PGP SIGNATURE-----



More information about the Opendnssec-develop mailing list