<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div class="">I can try and add some doc on that.<br></div></blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">

<div class=""></div></blockquote></div><br></div><div class="gmail_extra">I get the following error when fetching and merging from upstream:</div><div class="gmail_extra"><br></div><div class="gmail_extra"><div class="gmail_extra">
$ git fetch upstream</div><div class="gmail_extra">remote: Counting objects: 3, done.</div><div class="gmail_extra">remote: Compressing objects: 100% (3/3), done.</div><div class="gmail_extra">Unpacking objects: 100% (3/3), done.</div>
<div class="gmail_extra">remote: Total 3 (delta 0), reused 1 (delta 0)</div><div class="gmail_extra">From <a href="https://github.com/opendnssec/SoftHSMv2">https://github.com/opendnssec/SoftHSMv2</a></div><div class="gmail_extra">
 * [new branch]      master     -> upstream/master</div><div class="gmail_extra"><br></div><div class="gmail_extra">$ git merge --ff-only upstream/master master</div><div class="gmail_extra">fatal: Not possible to fast-forward, aborting.</div>
<div class="gmail_extra"><br></div><div class="gmail_extra"><br></div><div class="gmail_extra">But it works when I do:</div><div class="gmail_extra"><br></div><div class="gmail_extra"><div class="gmail_extra">$ git merge upstream/master</div>
<div class="gmail_extra">Updating 71eb9bb..89859e8</div><div class="gmail_extra">Fast-forward</div><div class="gmail_extra"> src/bin/dump/softhsm-dump-db.cpp |    1 +</div><div class="gmail_extra"> 1 file changed, 1 insertion(+)</div>
</div></div></div>