)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"a2ba5e1abea91517dd41c42b32ad25bf17dfa44e","unresolved":false,"context_lines":[{"line_number":31,"context_line":"This patch fixed it by updating instance.info_cache"},{"line_number":32,"context_line":"to the new ic after it is created."},{"line_number":33,"context_line":""},{"line_number":34,"context_line":" Conflicts:"},{"line_number":35,"context_line":"\tdoc/notification_samples/instance-shutdown-end.json"},{"line_number":36,"context_line":""},{"line_number":37,"context_line":"Co-Authored-By: huangtianhua@huawei.com"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3f79a3b5_a19f1563","line":34,"updated":"2018-10-03 23:17:07.000000000","message":"note: it\u0027s normally good form to leave a comment in the commit message about what caused the conflict, usually because of something that\u0027s not in the target branch, e.g.:\n\nhttps://review.openstack.org/#/c/605880/1//COMMIT_MSG@25\n\nIn this case it looks like it\u0027s a result of not having change I39059c5077c790aa85dff6b4563f581c54536b86 in Ocata.","commit_id":"cbf3b7c70331fc2a7e7fcf3fa2551d806000b967"}]}