<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
Hello,<br>
<br>
it is a harmless message, it can be avoided by running:<br>
<br>
git pull --ff --rebase origin master<br>
<br>
before pushing local commits to remote repository. It happened
because there were new commits in the remote repository pushed by
other developers comparing with yout local clone.<br>
<br>
Cheers,<br>
Daniel<br>
<br>
<div class="moz-cite-prefix">On 7/29/13 3:56 PM, Carlos Ruiz Díaz
wrote:<br>
</div>
<blockquote
cite="mid:CA+3gBckwXTfp6KYztw0_kZLtp6ZRB6NUbf_0_SD6dnV4YDYG1A@mail.gmail.com"
type="cite">
<div dir="ltr">Hi Daniel,
<div><br>
</div>
<div>this was unexpected. I hope I didn't screw something up.</div>
<div><br>
</div>
<div style="">Regards,</div>
<div style="">Carlos</div>
</div>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">
On Mon, Jul 29, 2013 at 9:51 AM, Carlos Ruiz Diaz <span
dir="ltr"><<a moz-do-not-send="true"
href="mailto:carlos.ruizdiaz@gmail.com" target="_blank">carlos.ruizdiaz@gmail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
Module: sip-router<br>
Branch: master<br>
Commit: 1bf5c8328e8b4ed13f6404bf617cac9e26c05e63<br>
URL: <a moz-do-not-send="true"
href="http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bf5c8328e8b4ed13f6404bf617cac9e26c05e63"
target="_blank">http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bf5c8328e8b4ed13f6404bf617cac9e26c05e63</a><br>
<br>
Author: Carlos Ruiz Diaz <<a moz-do-not-send="true"
href="mailto:carlos.ruizdiaz@gmail.com">carlos.ruizdiaz@gmail.com</a>><br>
Committer: Carlos Ruiz Diaz <<a moz-do-not-send="true"
href="mailto:carlos.ruizdiaz@gmail.com">carlos.ruizdiaz@gmail.com</a>><br>
Date: Mon Jul 29 09:49:57 2013 -0400<br>
<br>
Merge branch 'master' of <a class="moz-txt-link-freetext" href="ssh://">ssh://</a><a moz-do-not-send="true"
href="http://git.sip-router.org/sip-router"
target="_blank">git.sip-router.org/sip-router</a><br>
<br>
---<br>
<br>
<br>
<br>
<br>
_______________________________________________<br>
sr-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:sr-dev@lists.sip-router.org">sr-dev@lists.sip-router.org</a><br>
<a moz-do-not-send="true"
href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev"
target="_blank">http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev</a><br>
</blockquote>
</div>
<br>
<br clear="all">
<div><br>
</div>
-- <br>
Carlos
<div><a moz-do-not-send="true" href="http://caruizdiaz.com"
target="_blank">http://caruizdiaz.com</a></div>
<div>+595981146623</div>
</div>
</blockquote>
<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>