{"body":"First, rewinding head to replay your work on top of it...\nApplying: Nuage nova configuration ansible changes\nUsing index info to reconstruct a base tree...\nM       defaults/main.yml\nM       templates/nova.conf.j2\nFalling back to patching base and 3-way merge...\nAuto-merging templates/nova.conf.j2\nAuto-merging defaults/main.yml\nCONFLICT (content): Merge conflict in defaults/main.yml\nFailed to merge in the changes.\nPatch failed at 0001 Nuage nova configuration ansible changes\nThe copy of the patch that failed is found in:\n   /home/rohanp/NOVA-RSPACE-NUAGE-UPSTREAM/openstack-ansible-os_nova/.git/rebase-apply/patch\n\nWhen you have resolved this problem, run \"git rebase --continue\".\nIf you prefer to skip this patch, run \"git rebase --skip\" instead.\nTo check out the original branch and stop rebasing, run \"git rebase --abort\".\n","name":"","extension":"txt","url":"https://www.irccloud.com/pastebin/Ev61eEOM","modified":1459378467,"id":"Ev61eEOM","size":831,"lines":17,"own_paste":false,"theme":"","date":1459378467}