<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<br>
<div class="moz-cite-prefix">On 11/30/12 7:57 AM, Olle E. Johansson
wrote:<br>
</div>
<blockquote
cite="mid:7CA9F1CD-A286-4FCB-9B8D-33B39BFCE1D2@edvina.net"
type="cite">
<pre wrap="">
29 nov 2012 kl. 22:54 skrev Ovidiu Sas <a class="moz-txt-link-rfc2396E" href="mailto:osas@voipembedded.com"><osas@voipembedded.com></a>:
</pre>
<blockquote type="cite">
<pre wrap="">Please do a pull/fetch before any push to avoid this merge logs:
<a class="moz-txt-link-freetext" href="http://sip-router.org/wiki/git/commit-into-master">http://sip-router.org/wiki/git/commit-into-master</a>
</pre>
</blockquote>
<pre wrap="">I try to, but somehow your commit made it in the middle... Sorry for that.
Still learning and adopting to git. :-)</pre>
</blockquote>
It does not matter the order of the commits, before you push to
remote repository you will have to pull and rebase if someone pushed
other commits meanwhile. I other words, before pushing to
sip-router.org git master branch, is good to run [always]:<br>
<meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1">
<pre class="code">git pull --ff --rebase origin</pre>
Then no more merge notifications and logs.<br>
<br>
Cheers,<br>
Daniel<br>
<br>
<pre class="moz-signature" cols="72">--
Daniel-Constantin Mierla - <a class="moz-txt-link-freetext" href="http://www.asipto.com">http://www.asipto.com</a>
<a class="moz-txt-link-freetext" href="http://twitter.com/#!/miconda">http://twitter.com/#!/miconda</a> - <a class="moz-txt-link-freetext" href="http://www.linkedin.com/in/miconda">http://www.linkedin.com/in/miconda</a></pre>
</body>
</html>