17 Sep
2018
17 Sep
'18
3:11 p.m.
I will check the cherry pick conflict and do the backport manually if needed once. Going to be a bit later today.
Cheers, Daniel
On Mon, 17 Sep 2018, 17:05 Juha Heinanen, jh@tutpro.com wrote:
Juha Heinanen writes:
I'll backport to 5.1.
cherry-pick didn't work:
$ git cherry-pick -x f088d2afe4153b9e440a4293211c78f5a25af691 error: could not apply f088d2afe... core: if nosip msg hooks skip handling the packet, stop sip routing processing hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit'
I'm not sure if I dare to do manual edit.
-- Juha