Module: sip-router Branch: master Commit: a435f770e7162f73aea560a77851f8fb639a495a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a435f770...
Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@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
---
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=a435f770...
Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@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 -
Juha Heinanen