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

[Daniel-Constantin Mierla]

On 5/27/13 4:59 PM, Juha Heinanen wrote:
> Module: sip-router
> Branch: master
> Commit: a435f770e7162f73aea560a77851f8fb639a495a
> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a435f770e7162f73aea560a77851f8fb639a495a
>
> Author: Juha Heinanen <jh at tutpro.com>
> Committer: Juha Heinanen <jh at tutpro.com>
> Date:   Mon May 27 17:58:33 2013 +0300
>
> Merge branch 'master' of ssh://git.sip-router.org/sip-router
>
> - i did pull , but there was race conditions with somebody else's push
Have you done simple 'git pull ...' or also rebase and fast forward 'git 
--ff --rebase pull ...'?

Cheers,
Daniel


-- 
Daniel-Constantin Mierla - http://www.asipto.com
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
Kamailio Advanced Training, San Francisco, USA - June 24-27, 2013
   * http://asipto.com/u/katu *