)]}'
{"/PATCHSET_LEVEL":[{"author":{"_account_id":4393,"name":"Dan Smith","email":"dms@danplanet.com","username":"danms"},"change_message_id":"c6d00f348e0889260a32076266e0c1370b586ab9","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"4aee127b_5d5718b9","updated":"2022-07-15 17:31:20.000000000","message":"These seem like important and helpful clarifications to the expected behavior. What we have today apparently only contributes to the confusion about what happens when you review.","commit_id":"0ce32efb6d0215cf720d8e6eb491636523535f93"}],"git-review.1":[{"author":{"_account_id":5263,"name":"Jeremy Stanley","display_name":"fungi","email":"fungi@yuggoth.org","username":"fungi","status":"missing, presumed fed"},"change_message_id":"1e7eeb397b100f24a8f95340eba4f1fb229d2b9e","unresolved":false,"context_lines":[{"line_number":177,"context_line":"Turns on more verbose output."},{"line_number":178,"context_line":".It Fl R , Fl \\-no\\-rebase"},{"line_number":179,"context_line":"Don\u0027t test for possible merge conflicts with the target branch. Note that the"},{"line_number":180,"context_line":"test rebase is always rolled back, regardless of whether it succeeds or fails,"},{"line_number":181,"context_line":"and is merely an informational feature to warn you that your commits have a"},{"line_number":182,"context_line":"merge conflict with the state of the remote branch."},{"line_number":183,"context_line":".Pp"}],"source_content_type":"text/troff","patch_set":1,"id":"5d87947c_f31d3bd3","line":180,"updated":"2022-07-15 17:36:11.000000000","message":"Maybe this isn\u0027t entirely true, since the rebase is aborted if it ends in a merge conflict (and the user is left to fix up the conflicts, rather than automatically aborting and expecting them to manually rebase a second time). I could get more wordy here, I suppose?","commit_id":"0ce32efb6d0215cf720d8e6eb491636523535f93"},{"author":{"_account_id":5263,"name":"Jeremy Stanley","display_name":"fungi","email":"fungi@yuggoth.org","username":"fungi","status":"missing, presumed fed"},"change_message_id":"7fdf478030026eb1eff5dbcc4ff0881f8e7528de","unresolved":false,"context_lines":[{"line_number":177,"context_line":"Turns on more verbose output."},{"line_number":178,"context_line":".It Fl R , Fl \\-no\\-rebase"},{"line_number":179,"context_line":"Don\u0027t test for possible merge conflicts with the target branch. Note that the"},{"line_number":180,"context_line":"test rebase is always rolled back, regardless of whether it succeeds or fails,"},{"line_number":181,"context_line":"and is merely an informational feature to warn you that your commits have a"},{"line_number":182,"context_line":"merge conflict with the state of the remote branch."},{"line_number":183,"context_line":".Pp"}],"source_content_type":"text/troff","patch_set":1,"id":"c8a8094d_81210c60","line":180,"updated":"2022-07-15 18:19:07.000000000","message":"Thanks, going with Clark\u0027s suggested prose!","commit_id":"0ce32efb6d0215cf720d8e6eb491636523535f93"},{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"f46d984fd32cec3a95adea8863a7413cef3884c5","unresolved":false,"context_lines":[{"line_number":177,"context_line":"Turns on more verbose output."},{"line_number":178,"context_line":".It Fl R , Fl \\-no\\-rebase"},{"line_number":179,"context_line":"Don\u0027t test for possible merge conflicts with the target branch. Note that the"},{"line_number":180,"context_line":"test rebase is always rolled back, regardless of whether it succeeds or fails,"},{"line_number":181,"context_line":"and is merely an informational feature to warn you that your commits have a"},{"line_number":182,"context_line":"merge conflict with the state of the remote branch."},{"line_number":183,"context_line":".Pp"}],"source_content_type":"text/troff","patch_set":1,"id":"63c9f04a_bb2a1b9c","line":180,"in_reply_to":"5d87947c_f31d3bd3","updated":"2022-07-15 17:40:05.000000000","message":"I would say something like \"Don\u0027t test for possible merge conflicts with the target branch before pushing. If the test rebase detects no merge conflicts then the rebase is undone and your previous state is pushed. If merge conflicts are detected git-review exits with the rebase in progress allowing you to address it manually. By default git-review will never push the results of a rebase without your explicit involvement.\"","commit_id":"0ce32efb6d0215cf720d8e6eb491636523535f93"},{"author":{"_account_id":4393,"name":"Dan Smith","email":"dms@danplanet.com","username":"danms"},"change_message_id":"a716e11059a72f9356f4312c0fd95c7bc7f9d254","unresolved":false,"context_lines":[{"line_number":177,"context_line":"Turns on more verbose output."},{"line_number":178,"context_line":".It Fl R , Fl \\-no\\-rebase"},{"line_number":179,"context_line":"Don\u0027t test for possible merge conflicts with the target branch. Note that the"},{"line_number":180,"context_line":"test rebase is always rolled back, regardless of whether it succeeds or fails,"},{"line_number":181,"context_line":"and is merely an informational feature to warn you that your commits have a"},{"line_number":182,"context_line":"merge conflict with the state of the remote branch."},{"line_number":183,"context_line":".Pp"}],"source_content_type":"text/troff","patch_set":1,"id":"3c7f564a_0b94fabe","line":180,"in_reply_to":"5d87947c_f31d3bd3","updated":"2022-07-15 17:37:44.000000000","message":"It doesn\u0027t seem like it is always aborted to me. When I tested it just a few minutes ago, I have to run \u0027git rebase --abort\u0027 to get back to my original branch.","commit_id":"0ce32efb6d0215cf720d8e6eb491636523535f93"}]}