9 Jun
2010
9 Jun
'10
11:50 a.m.
Andrei Pelinescu-Onciul writes:
So far the only problem was the missing
info/allowed-users.
I md5'ed all the other hooks and they are the original version.
The repository data looks ok so far. I don't think Juha's pull conflict
is related to it.
i just gave up and deleted whole sip-router git directory. then i did
git clone --depth 1 git://git.sip-router.org/sip-router sip-router
git checkout -b kamailio_3.0 origin/kamailio_3.0
and when i then try to cherry pick the commit i earlier today did on
master, it fails like this:
$ eg cherry-pick 976fb426bb577fab033e7846625fbfa2a8a38399
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm
<paths>'
and commit the result with:
git commit -c 976fb426bb577fab033e7846625fbfa2a8a38399
-- juha