<div dir="ltr">On Fri, Feb 7, 2014 at 9:34 AM, Rickard Bellgrim <span dir="ltr"><<a href="mailto:rickard@opendnssec.org" target="_blank">rickard@opendnssec.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">$ git merge --ff-only upstream/master master<div class="gmail_extra">$ git merge upstream/master<br></div>
</div></blockquote><div><br></div><div>What branch where you on when you did merge without --ff-only?<br clear="all"></div></div><br>-- <br>Jerry Lundström - OpenDNSSEC Developer<br><a href="http://www.opendnssec.org/" target="_blank">http://www.opendnssec.org/</a><br>

</div></div>