# Pastebin HNyH6GyN [root@KollaDevAuto kolla-bringup]# cd kolla-kubernetes [root@KollaDevAuto kolla-kubernetes]# git fetch git://git.openstack.org/openstack/kolla-kubernetes refs/changes/40/439740/17 && git cherry-pick FETCH_HEAD remote: Counting objects: 13, done. remote: Compressing objects: 100% (6/6), done. remote: Total 7 (delta 6), reused 1 (delta 1) Unpacking objects: 100% (7/7), done. From git://git.openstack.org/openstack/kolla-kubernetes * branch refs/changes/40/439740/17 -> FETCH_HEAD error: could not apply 241b315... Fix problem with kollakube res create configmap hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' hint: and commit the result with 'git commit'