)]}'
{"/PATCHSET_LEVEL":[{"author":{"_account_id":7847,"name":"Alistair Coles","email":"alistairncoles@gmail.com","username":"acoles"},"change_message_id":"ce9d0b9fe5c23bb0ca73efc326460ea788b34ef9","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"ecdbb059_2a816900","updated":"2024-03-14 16:46:31.000000000","message":"I don\u0027t anticipate that we\u0027d merge this file back to master, but seemed useful for the lifetime of the feature branch.","commit_id":"942ffd3a4833ed046027343f2d473b495c2b6b0a"},{"author":{"_account_id":15343,"name":"Tim Burke","email":"tburke@nvidia.com","username":"tburke"},"change_message_id":"22f8f28ecb86fa0ffd181fa74e50928e9a81c042","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"6e1e03e6_065a4807","updated":"2024-03-14 17:08:12.000000000","message":"```\nWarning, treated as error:\n/home/zuul/src/opendev.org/openstack/swift/doc/source/contributor/working_with_feature_branch.rst:document isn\u0027t included in any toctree\n```","commit_id":"942ffd3a4833ed046027343f2d473b495c2b6b0a"},{"author":{"_account_id":15343,"name":"Tim Burke","email":"tburke@nvidia.com","username":"tburke"},"change_message_id":"310fbea7a6147b001e272fff7abe3c65940a4572","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"177be543_11b5aba3","updated":"2024-03-14 19:49:43.000000000","message":"Gonna be available at https://docs.openstack.org/swift/feature/mpu/contributor/working_with_feature_branch.html shortly 😊","commit_id":"256938544919924323e77a962bfc8830fa98ad89"}],"doc/source/contributor/working_with_feature_branch.rst":[{"author":{"_account_id":15343,"name":"Tim Burke","email":"tburke@nvidia.com","username":"tburke"},"change_message_id":"b6530fb0353fd586544a80c8cafe77ad2df8f1c6","unresolved":true,"context_lines":[{"line_number":17,"context_line":"Merging master to the feature branch"},{"line_number":18,"context_line":"------------------------------------"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"From time to time it is necessary to merge from master to the feature branch."},{"line_number":21,"context_line":"First, get master up-to-date::"},{"line_number":22,"context_line":""},{"line_number":23,"context_line":"      git checkout master"}],"source_content_type":"text/x-rst","patch_set":2,"id":"147de0d9_c33edfcc","line":20,"range":{"start_line":20,"start_character":0,"end_line":20,"end_character":17},"updated":"2024-03-14 19:48:39.000000000","message":"Historically, I think we\u0027ve recommended ~weekly, yeah? Might be worth calling out a recommended integration interval.","commit_id":"256938544919924323e77a962bfc8830fa98ad89"},{"author":{"_account_id":7847,"name":"Alistair Coles","email":"alistairncoles@gmail.com","username":"acoles"},"change_message_id":"2d2a1041c59a65407b0f47fc918db8c77f8c3581","unresolved":false,"context_lines":[{"line_number":17,"context_line":"Merging master to the feature branch"},{"line_number":18,"context_line":"------------------------------------"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"From time to time it is necessary to merge from master to the feature branch."},{"line_number":21,"context_line":"First, get master up-to-date::"},{"line_number":22,"context_line":""},{"line_number":23,"context_line":"      git checkout master"}],"source_content_type":"text/x-rst","patch_set":2,"id":"6cedc9b5_9ac8b0aa","line":20,"range":{"start_line":20,"start_character":0,"end_line":20,"end_character":17},"in_reply_to":"147de0d9_c33edfcc","updated":"2024-05-17 16:55:17.000000000","message":"Done","commit_id":"256938544919924323e77a962bfc8830fa98ad89"},{"author":{"_account_id":15343,"name":"Tim Burke","email":"tburke@nvidia.com","username":"tburke"},"change_message_id":"b6530fb0353fd586544a80c8cafe77ad2df8f1c6","unresolved":true,"context_lines":[{"line_number":27,"context_line":"the master branch, e.g.::"},{"line_number":28,"context_line":""},{"line_number":29,"context_line":"      git checkout -b merge-master remotes/origin/feature/mpu"},{"line_number":30,"context_line":"      git merge remotes/origin/master"},{"line_number":31,"context_line":""},{"line_number":32,"context_line":"If everything merges cleanly then the tip of your local branch will be a commit"},{"line_number":33,"context_line":"for the merge. However, there may be merge conflicts to resolve. Once you\u0027ve"}],"source_content_type":"text/x-rst","patch_set":2,"id":"e591ff51_6b0fd868","line":30,"range":{"start_line":30,"start_character":16,"end_line":30,"end_character":37},"updated":"2024-03-14 19:48:39.000000000","message":"FWIW, as long as you\u0027re being explicit about merging from the remote, you should be able to just `git fetch --all` without changing your local `master` branch.","commit_id":"256938544919924323e77a962bfc8830fa98ad89"},{"author":{"_account_id":7847,"name":"Alistair Coles","email":"alistairncoles@gmail.com","username":"acoles"},"change_message_id":"2d2a1041c59a65407b0f47fc918db8c77f8c3581","unresolved":false,"context_lines":[{"line_number":27,"context_line":"the master branch, e.g.::"},{"line_number":28,"context_line":""},{"line_number":29,"context_line":"      git checkout -b merge-master remotes/origin/feature/mpu"},{"line_number":30,"context_line":"      git merge remotes/origin/master"},{"line_number":31,"context_line":""},{"line_number":32,"context_line":"If everything merges cleanly then the tip of your local branch will be a commit"},{"line_number":33,"context_line":"for the merge. However, there may be merge conflicts to resolve. Once you\u0027ve"}],"source_content_type":"text/x-rst","patch_set":2,"id":"86cc7c87_bd5223ce","line":30,"range":{"start_line":30,"start_character":16,"end_line":30,"end_character":37},"in_reply_to":"e591ff51_6b0fd868","updated":"2024-05-17 16:55:17.000000000","message":"Done","commit_id":"256938544919924323e77a962bfc8830fa98ad89"},{"author":{"_account_id":15343,"name":"Tim Burke","email":"tburke@nvidia.com","username":"tburke"},"change_message_id":"b6530fb0353fd586544a80c8cafe77ad2df8f1c6","unresolved":true,"context_lines":[{"line_number":34,"context_line":"taken care of them, add all the affected files and then commit the merge::"},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"      git add"},{"line_number":37,"context_line":"      git commit -m \u0027merge master to feature/mpu\u0027"},{"line_number":38,"context_line":""},{"line_number":39,"context_line":".. note::"},{"line_number":40,"context_line":"      The ``git commit`` is only necessary when there have been merge"}],"source_content_type":"text/x-rst","patch_set":2,"id":"f137fc75_a602f0b9","line":37,"updated":"2024-03-14 19:48:39.000000000","message":"I typically do something more like\n```\ngit mergetool\ngit merge --continue\n```\nat this point, but yeah, this should work too.","commit_id":"256938544919924323e77a962bfc8830fa98ad89"},{"author":{"_account_id":15343,"name":"Tim Burke","email":"tburke@nvidia.com","username":"tburke"},"change_message_id":"b6530fb0353fd586544a80c8cafe77ad2df8f1c6","unresolved":true,"context_lines":[{"line_number":40,"context_line":"      The ``git commit`` is only necessary when there have been merge"},{"line_number":41,"context_line":"      conflicts."},{"line_number":42,"context_line":""},{"line_number":43,"context_line":"Push the merged branch to gerrit for review, using the ``-R`` option::"},{"line_number":44,"context_line":""},{"line_number":45,"context_line":"      git review -R"}],"source_content_type":"text/x-rst","patch_set":2,"id":"d6f058af_f654f252","line":43,"range":{"start_line":43,"start_character":45,"end_line":43,"end_character":68},"updated":"2024-03-14 19:48:39.000000000","message":"**This** is the big important part.","commit_id":"256938544919924323e77a962bfc8830fa98ad89"},{"author":{"_account_id":7847,"name":"Alistair Coles","email":"alistairncoles@gmail.com","username":"acoles"},"change_message_id":"2d2a1041c59a65407b0f47fc918db8c77f8c3581","unresolved":true,"context_lines":[{"line_number":40,"context_line":"      The ``git commit`` is only necessary when there have been merge"},{"line_number":41,"context_line":"      conflicts."},{"line_number":42,"context_line":""},{"line_number":43,"context_line":"Push the merged branch to gerrit for review, using the ``-R`` option::"},{"line_number":44,"context_line":""},{"line_number":45,"context_line":"      git review -R"}],"source_content_type":"text/x-rst","patch_set":2,"id":"2a007b98_f7c90add","line":43,"range":{"start_line":43,"start_character":45,"end_line":43,"end_character":68},"in_reply_to":"d6f058af_f654f252","updated":"2024-05-17 16:55:17.000000000","message":"Yeah, I\u0027d meant to emphasize that, will add a note.","commit_id":"256938544919924323e77a962bfc8830fa98ad89"}]}