[sr-dev] what to do when cherry-picking (backporting) doesn't apply nicely

[Luis Azedo]

Hi,


i needed this commit

https://github.com/kamailio/kamailio/commit/d63869cd31a0ac0a61f218b3144de7a9f400e0ae

because of https://github.com/kamailio/kamailio/commit/c7bec3320f6907c4edd8416a5e5cfa89b071a411


the tm commit was backported to 4.4 and 4.3

my commit applies directly to 4.4 and that's not a problem but there were some changes in kazoo module from 4.3 to 4.4 and the cherry-pick doesn't apply nicely.

what should we do in these situations since 4.3 needs this update ?


Thanks

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