)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"77657cfe66033e18db84f02d494933a007c9319e","unresolved":false,"context_lines":[{"line_number":19,"context_line":"NOTE(takashin): The conflict is due to not having the following changes"},{"line_number":20,"context_line":"in stable/ocata."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"    I5165b69f956fbf1904112a742698b2739f747e72"},{"line_number":23,"context_line":"    I1121eaf24856dcb74f07c224531a821b3cdc46fc"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Change-Id: I49460ec3b572ee14b32229e771a5499ff91e8722"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"7faddb67_a3e89b15","line":22,"range":{"start_line":22,"start_character":4,"end_line":22,"end_character":45},"updated":"2019-08-19 13:19:02.000000000","message":"You can rebase on this:\n\nhttps://review.opendev.org/#/c/677201/","commit_id":"f3cb82dd7da8f570ebec7c5bdfc51b5647bacee8"},{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"cac3a11928ec7a6d353282bc6a007b939c944ba9","unresolved":false,"context_lines":[{"line_number":19,"context_line":"NOTE(takashin): The conflict is due to not having the following changes"},{"line_number":20,"context_line":"in stable/ocata."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"    I5165b69f956fbf1904112a742698b2739f747e72"},{"line_number":23,"context_line":"    I1121eaf24856dcb74f07c224531a821b3cdc46fc"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Change-Id: I49460ec3b572ee14b32229e771a5499ff91e8722"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"7faddb67_bb60b802","line":22,"range":{"start_line":22,"start_character":4,"end_line":22,"end_character":45},"in_reply_to":"7faddb67_a3e89b15","updated":"2019-08-20 02:01:35.000000000","message":"Done","commit_id":"f3cb82dd7da8f570ebec7c5bdfc51b5647bacee8"},{"author":{"_account_id":26458,"name":"Brin Zhang","email":"zhangbailin@inspur.com","username":"zhangbailin"},"change_message_id":"34d57d0dac986c582ad718b167dc7d34a70ad1ab","unresolved":false,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Add assertTrue where the nova.objects.base.obj_equal_prims is called."},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Conflicts:"},{"line_number":16,"context_line":"    nova/tests/unit/objects/test_build_request.py"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"NOTE(takashin): The conflict is due to not having the following change"},{"line_number":19,"context_line":"in stable/ocata."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"7faddb67_7e19ce77","line":16,"range":{"start_line":15,"start_character":0,"end_line":16,"end_character":49},"updated":"2019-08-20 02:22:03.000000000","message":"This conflicts info need to be removed.","commit_id":"bd0f2431aff9f1c983907d146e55c2fb6ff0d4c2"},{"author":{"_account_id":26458,"name":"Brin Zhang","email":"zhangbailin@inspur.com","username":"zhangbailin"},"change_message_id":"ccb9b92ef8aa1134918c30ba79e31dd4edd28908","unresolved":false,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Add assertTrue where the nova.objects.base.obj_equal_prims is called."},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Conflicts:"},{"line_number":16,"context_line":"    nova/tests/unit/objects/test_build_request.py"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"NOTE(takashin): The conflict is due to not having the following change"},{"line_number":19,"context_line":"in stable/ocata."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"7faddb67_3eea760e","line":16,"range":{"start_line":15,"start_character":0,"end_line":16,"end_character":49},"in_reply_to":"7faddb67_1e577a03","updated":"2019-08-20 02:41:45.000000000","message":"yeah, this patch change will not lead to conflicts, I think it is okay to record this conflict.","commit_id":"bd0f2431aff9f1c983907d146e55c2fb6ff0d4c2"},{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"43f2856702d9b15bf283ba77e5505f14568e8152","unresolved":false,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Add assertTrue where the nova.objects.base.obj_equal_prims is called."},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Conflicts:"},{"line_number":16,"context_line":"    nova/tests/unit/objects/test_build_request.py"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"NOTE(takashin): The conflict is due to not having the following change"},{"line_number":19,"context_line":"in stable/ocata."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"7faddb67_1e577a03","line":16,"range":{"start_line":15,"start_character":0,"end_line":16,"end_character":49},"in_reply_to":"7faddb67_7e19ce77","updated":"2019-08-20 02:25:27.000000000","message":"No. It is necesarry.\nWhen applying the patch, the conflict occurs in nova/tests/unit/objects/test_build_request.py (not nova/tests/functional/db/test_build_request.py).","commit_id":"bd0f2431aff9f1c983907d146e55c2fb6ff0d4c2"}]}