[Opendnssec-develop] Move to git

[Jerry Lundström]

On 04 Feb 2014, at 09:13 , Rickard Bellgrim <rickard at opendnssec.org> wrote:

> When I do "git merge upstream/develop develop":

I’ve tested some my self now and I can’t replicate what you got. So I can only conclude that you have an unclean fork where the commit history differs from the upstream. You should delete your fork and refork.

I will change the documentation some and add —ff-only for the merge since it should always only fast forward the changes (which does not add a merge message) otherwise something is wrong.

--
Jerry Lundström - OpenDNSSEC Developer
http://www.opendnssec.org/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 625 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.opendnssec.org/pipermail/opendnssec-develop/attachments/20140204/7f388893/attachment.bin>