[sr-dev] git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

[Daniel-Constantin Mierla]

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 at gmail.com <mailto:carlos.ruizdiaz at gmail.com>> wrote:
>
>     Module: sip-router
>     Branch: master
>     Commit: 1bf5c8328e8b4ed13f6404bf617cac9e26c05e63
>     URL:
>     http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bf5c8328e8b4ed13f6404bf617cac9e26c05e63
>
>     Author: Carlos Ruiz Diaz <carlos.ruizdiaz at gmail.com
>     <mailto:carlos.ruizdiaz at gmail.com>>
>     Committer: Carlos Ruiz Diaz <carlos.ruizdiaz at gmail.com
>     <mailto:carlos.ruizdiaz at gmail.com>>
>     Date:   Mon Jul 29 09:49:57 2013 -0400
>
>     Merge branch 'master' of ssh://git.sip-router.org/sip-router
>     <http://git.sip-router.org/sip-router>
>
>     ---
>
>
>
>
>     _______________________________________________
>     sr-dev mailing list
>     sr-dev at lists.sip-router.org <mailto:sr-dev at 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.com
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sip-router.org/pipermail/sr-dev/attachments/20130729/ce7d69e2/attachment.html>