[Opendnssec-develop] Move to git

[Jerry Lundström]

On Fri, Feb 7, 2014 at 9:34 AM, Rickard Bellgrim <rickard at opendnssec.org>wrote:

> $ git merge --ff-only upstream/master master
> $ git merge upstream/master
>

What branch where you on when you did merge without --ff-only?

-- 
Jerry Lundström - OpenDNSSEC Developer
http://www.opendnssec.org/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opendnssec.org/pipermail/opendnssec-develop/attachments/20140207/e7fa92ea/attachment.htm>