<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 dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5"><div><span style="color:rgb(34,34,34)">No, I've not made any config.</span><br></div></div></div><div><br></div><div>Where is the workflow/instructions are you getting merge commits?<br>

</div></div><div class="im"></div></div></div></blockquote></div><br></div><div class="gmail_extra">When I do "git merge upstream/develop develop":</div><div class="gmail_extra"><br></div><div class="gmail_extra">
<div class="gmail_extra">$ git branch -D gitignore</div><div class="gmail_extra">Deleted branch gitignore (was 15e51fa).</div><div class="gmail_extra"><br></div><div class="gmail_extra">$ git push origin :gitignore</div><div class="gmail_extra">
To git@github.com:bellgrim/SoftHSMv1.git</div><div class="gmail_extra"> - [deleted]         gitignore</div><div class="gmail_extra"><br></div><div class="gmail_extra">$ git fetch upstream</div><div class="gmail_extra">remote: Counting objects: 4, done.</div>
<div class="gmail_extra">remote: Compressing objects: 100% (4/4), done.</div><div class="gmail_extra">remote: Total 4 (delta 0), reused 0 (delta 0)</div><div class="gmail_extra">Unpacking objects: 100% (4/4), done.</div><div class="gmail_extra">
>From <a href="https://github.com/opendnssec/SoftHSMv1">https://github.com/opendnssec/SoftHSMv1</a></div><div class="gmail_extra"> * [new branch]      develop    -> upstream/develop</div><div class="gmail_extra"> * [new branch]      master     -> upstream/master</div>
<div class="gmail_extra"><br></div><div class="gmail_extra">$ git merge upstream/master master</div><div class="gmail_extra">Already up-to-date. Yeeah!</div><div class="gmail_extra"><br></div><div class="gmail_extra">$ git merge upstream/develop develop</div>
<div class="gmail_extra">Fast-forwarding to: upstream/develop</div><div class="gmail_extra">Already up-to-date with develop</div><div class="gmail_extra">Merge made by the 'octopus' strategy.</div><div class="gmail_extra">
 .gitignore |   38 ++++++++++++++++++++++++++++++++++++++</div><div class="gmail_extra"> 1 file changed, 38 insertions(+)</div><div class="gmail_extra"> create mode 100644 .gitignore</div><div class="gmail_extra"><br></div>
<div class="gmail_extra">$ git log</div><div class="gmail_extra">commit a64ee8215df6c0b8839a826df2d7a4c4f81971b3</div><div class="gmail_extra">Author: Rickard Bellgrim <<a href="mailto:rickard@opendnssec.org">rickard@opendnssec.org</a>></div>
<div class="gmail_extra">Date:   Tue Feb 4 09:06:43 2014 +0100</div><div class="gmail_extra"><br></div><div class="gmail_extra">    Merge branch 'develop', remote-tracking branch 'upstream/develop' into devel</div>
<div class="gmail_extra"><br></div><div class="gmail_extra">$ git push --all</div><div class="gmail_extra">Counting objects: 6, done.</div><div class="gmail_extra">Delta compression using up to 4 threads.</div><div class="gmail_extra">
Compressing objects: 100% (5/5), done.</div><div class="gmail_extra">Writing objects: 100% (5/5), 890 bytes, done.</div><div class="gmail_extra">Total 5 (delta 2), reused 0 (delta 0)</div><div class="gmail_extra">To git@github.com:bellgrim/SoftHSMv1.git</div>
<div class="gmail_extra">   050e4e8..a64ee82  develop -> develop</div></div></div>