29 Jul
2013
29 Jul
'13
5:05 p.m.
Ok, thanks for the hint :-).
Regards,
Carlos
On Mon, Jul 29, 2013 at 10:00 AM, Daniel-Constantin Mierla <
miconda(a)gmail.com> wrote:
Hello,
it is a harmless message, it can be avoided by running:
git pull --ff --rebase origin master
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.
Cheers,
Daniel
On 7/29/13 3:56 PM, Carlos Ruiz Díaz wrote:
Hi Daniel,
this was unexpected. I hope I didn't screw something up.
Regards,
Carlos
On Mon, Jul 29, 2013 at 9:51 AM, Carlos Ruiz Diaz <
carlos.ruizdiaz(a)gmail.com> wrote:
--
Carlos
http://caruizdiaz.com
+595981146623
Module: sip-router
Branch: master
Commit: 1bf5c8328e8b4ed13f6404bf617cac9e26c05e63
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bf5c83…
Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com>
Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com>
Date: Mon Jul 29 09:49:57 2013 -0400
Merge branch 'master' of ssh://git.sip-router.org/sip-router
---
_______________________________________________
sr-dev mailing list
sr-dev(a)lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
--
Carlos
http://caruizdiaz.com
+595981146623
--
Daniel-Constantin Mierla - http://www.asipto.comhttp://twitter.com/#!/miconda -
http://www.linkedin.com/in/miconda