<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Feb 7, 2014 at 9:50 AM, Jerry Lundström <span dir="ltr"><<a href="mailto:jerry@opendnssec.org" target="_blank">jerry@opendnssec.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="">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><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"><div class="">$ git merge --ff-only upstream/master master</div><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><div class=""></div></div></div></blockquote></div><br></div><div class="gmail_extra">master for SoftHSMv2.</div>
<div class="gmail_extra"><br></div><div class="gmail_extra">// Rickard</div></div>