)]}'
{"doc/contributor-guide/source/additional-git-workflow/rebase.rst":[{"author":{"_account_id":6547,"name":"Andreas Jaeger","email":"jaegerandi@gmail.com","username":"jaegerandi"},"change_message_id":"f760bd82f7c7f874a674241cb91c80a5ff4d670e","unresolved":false,"context_lines":[{"line_number":3,"context_line":"Rebase the topic branch from master branch"},{"line_number":4,"context_line":"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"},{"line_number":5,"context_line":""},{"line_number":6,"context_line":"``Git Rebase`` is used to integrate changes from one branch"},{"line_number":7,"context_line":"into another branch. If the new commits in the master branch"},{"line_number":8,"context_line":"are relevant to the feature that you’re working on.To incorporate"},{"line_number":9,"context_line":"the new commits into your topic branch, you can do ``git rebase``."}],"source_content_type":"text/x-rst","patch_set":1,"id":"5a18252c_3a8a07c0","line":6,"updated":"2016-04-13 11:12:49.000000000","message":"Rebasing should only be done in case of conflicts, it\u0027s not part of normal workflow.","commit_id":"08682635bf7f0a000f5240fbfdd53a94b7d43f1f"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"23ab9003040bee346b9b473d80a23fa91c91844b","unresolved":false,"context_lines":[{"line_number":3,"context_line":"Rebase the topic branch from master branch"},{"line_number":4,"context_line":"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"},{"line_number":5,"context_line":""},{"line_number":6,"context_line":"``Git Rebase`` is used to integrate changes from one branch"},{"line_number":7,"context_line":"into another branch. If the new commits in the master branch"},{"line_number":8,"context_line":"are relevant to the feature that you’re working on.To incorporate"},{"line_number":9,"context_line":"the new commits into your topic branch, you can do ``git rebase``."}],"source_content_type":"text/x-rst","patch_set":1,"id":"5a18252c_45dc44e4","line":6,"in_reply_to":"5a18252c_3a8a07c0","updated":"2016-04-13 11:33:22.000000000","message":"+1 The intro needs to be rephrased.","commit_id":"08682635bf7f0a000f5240fbfdd53a94b7d43f1f"},{"author":{"_account_id":167,"name":"Christian Berendt","email":"berendt@osism.tech","username":"berendt"},"change_message_id":"25adb73e368fbf6c7c113bbcebe5f4fb2f0cc511","unresolved":false,"context_lines":[{"line_number":5,"context_line":""},{"line_number":6,"context_line":"``Git Rebase`` is used to integrate changes from one branch"},{"line_number":7,"context_line":"into another branch. If the new commits in the master branch"},{"line_number":8,"context_line":"are relevant to the feature that you’re working on.To incorporate"},{"line_number":9,"context_line":"the new commits into your topic branch, you can do ``git rebase``."},{"line_number":10,"context_line":""},{"line_number":11,"context_line":".. Warning::"}],"source_content_type":"text/x-rst","patch_set":1,"id":"5a18252c_13e1be9a","line":8,"range":{"start_line":8,"start_character":48,"end_line":8,"end_character":53},"updated":"2016-04-14 09:46:22.000000000","message":"missing space","commit_id":"08682635bf7f0a000f5240fbfdd53a94b7d43f1f"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"23ab9003040bee346b9b473d80a23fa91c91844b","unresolved":false,"context_lines":[{"line_number":10,"context_line":""},{"line_number":11,"context_line":".. Warning::"},{"line_number":12,"context_line":""},{"line_number":13,"context_line":"      Never do ``git rebase`` on public(master) branches."},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"#. Wait for the change to be merged into the master branch."},{"line_number":16,"context_line":""}],"source_content_type":"text/x-rst","patch_set":1,"id":"5a18252c_85781cf4","line":13,"range":{"start_line":13,"start_character":38,"end_line":13,"end_character":40},"updated":"2016-04-13 11:33:22.000000000","message":"Please add a space.","commit_id":"08682635bf7f0a000f5240fbfdd53a94b7d43f1f"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"23ab9003040bee346b9b473d80a23fa91c91844b","unresolved":false,"context_lines":[{"line_number":26,"context_line":""},{"line_number":27,"context_line":"      $ git checkout -b bug/1506693 remotes/origin/master"},{"line_number":28,"context_line":""},{"line_number":29,"context_line":"#. commit the changes for the new fix :"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"   .. code-block:: console"},{"line_number":32,"context_line":""}],"source_content_type":"text/x-rst","patch_set":1,"id":"5a18252c_651ce0c1","line":29,"range":{"start_line":29,"start_character":3,"end_line":29,"end_character":4},"updated":"2016-04-13 11:33:22.000000000","message":"Commit","commit_id":"08682635bf7f0a000f5240fbfdd53a94b7d43f1f"},{"author":{"_account_id":6547,"name":"Andreas Jaeger","email":"jaegerandi@gmail.com","username":"jaegerandi"},"change_message_id":"f760bd82f7c7f874a674241cb91c80a5ff4d670e","unresolved":false,"context_lines":[{"line_number":40,"context_line":""},{"line_number":41,"context_line":"   .. Note::"},{"line_number":42,"context_line":""},{"line_number":43,"context_line":"      Make a practice of doing git rebase before doing git review, so that you may avoid the conflicts."},{"line_number":44,"context_line":""},{"line_number":45,"context_line":"#. Resolve conflicts if any, then run:"},{"line_number":46,"context_line":""}],"source_content_type":"text/x-rst","patch_set":1,"id":"5a18252c_7a591f5a","line":43,"range":{"start_line":43,"start_character":6,"end_line":43,"end_character":103},"updated":"2016-04-13 11:12:49.000000000","message":"Plese don\u0027t. git review will do a test rebase and tell you if it\u0027s wrong - and gerrit will as well.\n\nIf you just rebase, it makes comparision betweeen revisions impossible.","commit_id":"08682635bf7f0a000f5240fbfdd53a94b7d43f1f"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"23ab9003040bee346b9b473d80a23fa91c91844b","unresolved":false,"context_lines":[{"line_number":48,"context_line":""},{"line_number":49,"context_line":"      $ git rebase --continue"},{"line_number":50,"context_line":""},{"line_number":51,"context_line":"#. Run :command:`tox`, Push the commit for review:"},{"line_number":52,"context_line":""},{"line_number":53,"context_line":"   .. code-block:: console"},{"line_number":54,"context_line":""}],"source_content_type":"text/x-rst","patch_set":1,"id":"5a18252c_a57c38ec","line":51,"range":{"start_line":51,"start_character":23,"end_line":51,"end_character":24},"updated":"2016-04-13 11:33:22.000000000","message":"then push","commit_id":"08682635bf7f0a000f5240fbfdd53a94b7d43f1f"},{"author":{"_account_id":6547,"name":"Andreas Jaeger","email":"jaegerandi@gmail.com","username":"jaegerandi"},"change_message_id":"653f393a532e6fd5bd4d1f8c7037aa71d7202406","unresolved":false,"context_lines":[{"line_number":1,"context_line":".. _git-rebase:"},{"line_number":2,"context_line":""},{"line_number":3,"context_line":"Rebase the topic branch from master branch"},{"line_number":4,"context_line":"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"},{"line_number":5,"context_line":""},{"line_number":6,"context_line":"``Git Rebase`` is used to integrate changes from one branch"}],"source_content_type":"text/x-rst","patch_set":2,"id":"5a18252c_b52385a6","line":3,"updated":"2016-04-14 12:00:42.000000000","message":"Let\u0027s only document here: Resolving merge conflicts\n\nAnd write the document this way. This should not be a generic git rebase discussion, it\u0027s needs to be specific to the use case we have: A change that I submitted to gerrit has a merge conflict and needs rebasing.","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":6547,"name":"Andreas Jaeger","email":"jaegerandi@gmail.com","username":"jaegerandi"},"change_message_id":"653f393a532e6fd5bd4d1f8c7037aa71d7202406","unresolved":false,"context_lines":[{"line_number":23,"context_line":""},{"line_number":24,"context_line":"   .. code-block:: console"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"      $ git checkout -b bug/1506693 remotes/origin/master"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"#. Commit the changes for the new fix :"},{"line_number":29,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"5a18252c_f5121d56","line":26,"updated":"2016-04-14 12:00:42.000000000","message":"git review -d CHANGENUMBER instead","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"change_message_id":"bf6526cf155d4f62748cf7eb2d00a68b097271cb","unresolved":false,"context_lines":[{"line_number":23,"context_line":""},{"line_number":24,"context_line":"   .. code-block:: console"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"      $ git checkout -b bug/1506693 remotes/origin/master"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"#. Commit the changes for the new fix :"},{"line_number":29,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a122d0e_e13bb136","line":26,"in_reply_to":"1a122d0e_7c69688b","updated":"2016-04-19 00:06:43.000000000","message":"Hi Monika,\n\nAndreas means that instead of having \"$ git checkout -b bug/1506693\u0027 that you use the command he has given you as an example instead. Also please do not stipulate a bug number... this is  confusing for first time readers. Using the CHANGENUMBER as a variable is clear enough.","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":19390,"name":"monika","email":"monikaparkar25@gmail.com","username":"monika"},"change_message_id":"9968e45b40c4d6e78d5b744748fc207ead27be13","unresolved":false,"context_lines":[{"line_number":23,"context_line":""},{"line_number":24,"context_line":"   .. code-block:: console"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"      $ git checkout -b bug/1506693 remotes/origin/master"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"#. Commit the changes for the new fix :"},{"line_number":29,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a122d0e_7c69688b","line":26,"in_reply_to":"5a18252c_f5121d56","updated":"2016-04-15 12:32:20.000000000","message":"Hi Andreas Jaeger, Can you explain in detail, so that it will be helpful for me to do the changes.Thanks","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"change_message_id":"bf6526cf155d4f62748cf7eb2d00a68b097271cb","unresolved":false,"context_lines":[{"line_number":25,"context_line":""},{"line_number":26,"context_line":"      $ git checkout -b bug/1506693 remotes/origin/master"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"#. Commit the changes for the new fix :"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"   .. code-block:: console"},{"line_number":31,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a122d0e_414b85c9","line":28,"range":{"start_line":28,"start_character":37,"end_line":28,"end_character":38},"updated":"2016-04-19 00:06:43.000000000","message":"remove the space here","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":10497,"name":"KATO Tomoyuki","email":"kato.tomoyuki@jp.fujitsu.com","username":"to222"},"change_message_id":"e890a83ecaa1bd4ab9db08ae0ae348df4280318e","unresolved":false,"context_lines":[{"line_number":33,"context_line":""},{"line_number":34,"context_line":"#. Rebase the topic branch from master branch:"},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"   .. Code-block:: console"},{"line_number":37,"context_line":""},{"line_number":38,"context_line":"      $ git rebase master"},{"line_number":39,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"5a18252c_b2138db7","line":36,"range":{"start_line":36,"start_character":6,"end_line":36,"end_character":10},"updated":"2016-04-14 14:58:51.000000000","message":"code","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":10497,"name":"KATO Tomoyuki","email":"kato.tomoyuki@jp.fujitsu.com","username":"to222"},"change_message_id":"e890a83ecaa1bd4ab9db08ae0ae348df4280318e","unresolved":false,"context_lines":[{"line_number":37,"context_line":""},{"line_number":38,"context_line":"      $ git rebase master"},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"#. Resolve conflicts if any, then run:"},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"   .. code-block:: console"},{"line_number":43,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"5a18252c_f257c557","line":40,"range":{"start_line":40,"start_character":3,"end_line":40,"end_character":10},"updated":"2016-04-14 14:58:51.000000000","message":"how do we resolve the conflicts?","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"change_message_id":"bf6526cf155d4f62748cf7eb2d00a68b097271cb","unresolved":false,"context_lines":[{"line_number":37,"context_line":""},{"line_number":38,"context_line":"      $ git rebase master"},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"#. Resolve conflicts if any, then run:"},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"   .. code-block:: console"},{"line_number":43,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a122d0e_a11099a9","line":40,"range":{"start_line":40,"start_character":3,"end_line":40,"end_character":10},"in_reply_to":"1a122d0e_bf081293","updated":"2016-04-19 00:06:43.000000000","message":"+1 if you are going to write instructions on how to do this step by step, I think it is important that you include instructions on what a conflict looks like, where you can find it, and how to fix it properly.","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":10497,"name":"KATO Tomoyuki","email":"kato.tomoyuki@jp.fujitsu.com","username":"to222"},"change_message_id":"796934de7f244058ec9d1a62e8dd467b25825d0d","unresolved":false,"context_lines":[{"line_number":37,"context_line":""},{"line_number":38,"context_line":"      $ git rebase master"},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"#. Resolve conflicts if any, then run:"},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"   .. code-block:: console"},{"line_number":43,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a122d0e_bf081293","line":40,"range":{"start_line":40,"start_character":3,"end_line":40,"end_character":10},"in_reply_to":"5a18252c_55a82377","updated":"2016-04-15 13:04:08.000000000","message":"I think it\u0027s better to write how to resolve manually.","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":19390,"name":"monika","email":"monikaparkar25@gmail.com","username":"monika"},"change_message_id":"badf902d859cf3be2157935dcf8c5b4b9022cca0","unresolved":false,"context_lines":[{"line_number":37,"context_line":""},{"line_number":38,"context_line":"      $ git rebase master"},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"#. Resolve conflicts if any, then run:"},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"   .. code-block:: console"},{"line_number":43,"context_line":""}],"source_content_type":"text/x-rst","patch_set":2,"id":"5a18252c_55a82377","line":40,"range":{"start_line":40,"start_character":3,"end_line":40,"end_character":10},"in_reply_to":"5a18252c_f257c557","updated":"2016-04-15 11:17:21.000000000","message":"Conflicts we need to resolve manually.","commit_id":"afd60d3bc1c53a2e24d09d14727b2cb3f814bb0a"},{"author":{"_account_id":16237,"name":"venkatamahesh","email":"venkatamaheshkotha@gmail.com","username":"venkatamahesh"},"change_message_id":"61773eb4879ba64bbcd85bf5b085990aef6bd1d5","unresolved":false,"context_lines":[{"line_number":7,"context_line":"into another branch to resolve conflicts, when multiple commits"},{"line_number":8,"context_line":"happen on the same file."},{"line_number":9,"context_line":""},{"line_number":10,"context_line":".. Warning::"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"      Never do ``git rebase`` on public (master) branches."},{"line_number":13,"context_line":""}],"source_content_type":"text/x-rst","patch_set":3,"id":"1a122d0e_078106fc","line":10,"range":{"start_line":10,"start_character":3,"end_line":10,"end_character":4},"updated":"2016-04-21 13:20:44.000000000","message":"use lower case \u0027w\u0027","commit_id":"b33a2d2ac42cc8c4d57b7fa07d35496fd540092e"},{"author":{"_account_id":16237,"name":"venkatamahesh","email":"venkatamaheshkotha@gmail.com","username":"venkatamahesh"},"change_message_id":"61773eb4879ba64bbcd85bf5b085990aef6bd1d5","unresolved":false,"context_lines":[{"line_number":31,"context_line":""},{"line_number":32,"context_line":"      $ git commit"},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"#. Run :command:\u0027tox\u0027, then push the commit for review:"},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"   .. code-block:: console"},{"line_number":37,"context_line":""}],"source_content_type":"text/x-rst","patch_set":3,"id":"1a122d0e_87da3616","line":34,"range":{"start_line":34,"start_character":16,"end_line":34,"end_character":21},"updated":"2016-04-21 13:20:44.000000000","message":"change to `tox`","commit_id":"b33a2d2ac42cc8c4d57b7fa07d35496fd540092e"},{"author":{"_account_id":6547,"name":"Andreas Jaeger","email":"jaegerandi@gmail.com","username":"jaegerandi"},"change_message_id":"0f6a050176348c89734ac1ee860ef92c173c79c1","unresolved":false,"context_lines":[{"line_number":9,"context_line":""},{"line_number":10,"context_line":".. Warning::"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"      Never do ``git rebase`` on public (master) branches."},{"line_number":13,"context_line":""},{"line_number":14,"context_line":"#. Wait for the change to be merged into the master branch."},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"#. Make sure your repository is up to date:"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"   .. code-block:: console"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"      $ git fetch origin"},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"#. Create a topic branch by branching from master branch:"},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"   .. code-block:: console"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"      $ git checkout -b CHANGENUMBER remotes/origin/master"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"#. Commit the changes for the new fix:"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"   .. code-block:: console"},{"line_number":31,"context_line":""},{"line_number":32,"context_line":"      $ git commit"},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"#. Run :command:\u0027tox\u0027, then push the commit for review:"},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"   .. code-block:: console"},{"line_number":37,"context_line":""},{"line_number":38,"context_line":"      $ git review"},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"#. Resolve conflicts manually:"},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"   Conflicts are marked in a file with clear line breaks:"},{"line_number":43,"context_line":""},{"line_number":44,"context_line":"   ..code-block:: console"},{"line_number":45,"context_line":""}],"source_content_type":"text/x-rst","patch_set":3,"id":"1a122d0e_c4c0952d","line":42,"range":{"start_line":12,"start_character":1,"end_line":42,"end_character":57},"updated":"2016-04-21 20:01:29.000000000","message":"This is the wrong workflow IMHO.\n\nHere\u0027s what I think needs to be documented:\n1) You submit a change\n2) Somebody else submits a change and that change merges\n3) Now your change has a merge conflict\n4) Download master\n5) Download your change with \"git review -d XXX\"\n6) Rebase your change: \"git rebase origin/master\"\n7) Resolve conflict\n8) send rebased patch again for review\n\nI suggest you go through this workflow yourself once to see how it works...","commit_id":"b33a2d2ac42cc8c4d57b7fa07d35496fd540092e"},{"author":{"_account_id":10497,"name":"KATO Tomoyuki","email":"kato.tomoyuki@jp.fujitsu.com","username":"to222"},"change_message_id":"9b9ca73a118455e7e63b66215b244da72d6addcc","unresolved":false,"context_lines":[{"line_number":9,"context_line":""},{"line_number":10,"context_line":".. Warning::"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"      Never do ``git rebase`` on public (master) branches."},{"line_number":13,"context_line":""},{"line_number":14,"context_line":"#. Wait for the change to be merged into the master branch."},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"#. Make sure your repository is up to date:"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"   .. code-block:: console"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"      $ git fetch origin"},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"#. Create a topic branch by branching from master branch:"},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"   .. code-block:: console"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"      $ git checkout -b CHANGENUMBER remotes/origin/master"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"#. Commit the changes for the new fix:"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"   .. code-block:: console"},{"line_number":31,"context_line":""},{"line_number":32,"context_line":"      $ git commit"},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"#. Run :command:\u0027tox\u0027, then push the commit for review:"},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"   .. code-block:: console"},{"line_number":37,"context_line":""},{"line_number":38,"context_line":"      $ git review"},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"#. Resolve conflicts manually:"},{"line_number":41,"context_line":""},{"line_number":42,"context_line":"   Conflicts are marked in a file with clear line breaks:"},{"line_number":43,"context_line":""},{"line_number":44,"context_line":"   ..code-block:: console"},{"line_number":45,"context_line":""}],"source_content_type":"text/x-rst","patch_set":3,"id":"dab17558_ca04cc7f","line":42,"range":{"start_line":12,"start_character":1,"end_line":42,"end_character":57},"in_reply_to":"1a122d0e_c4c0952d","updated":"2016-05-09 13:11:07.000000000","message":"+1. I\u0027d like to use \"git review -d\" command simply.","commit_id":"b33a2d2ac42cc8c4d57b7fa07d35496fd540092e"},{"author":{"_account_id":19779,"name":"Chason Chan","display_name":"chenxing","email":"chason.chan@foxmail.com","username":"chenxing"},"change_message_id":"4362d6459a88da17e7f9deda20015e36bbe090fe","unresolved":false,"context_lines":[{"line_number":41,"context_line":""},{"line_number":42,"context_line":"   Conflicts are marked in a file with clear line breaks:"},{"line_number":43,"context_line":""},{"line_number":44,"context_line":"   ..code-block:: console"},{"line_number":45,"context_line":""},{"line_number":46,"context_line":"     \u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD"},{"line_number":47,"context_line":"     Second line."}],"source_content_type":"text/x-rst","patch_set":3,"id":"1a122d0e_ffa8cadd","line":44,"range":{"start_line":44,"start_character":3,"end_line":44,"end_character":15},"updated":"2016-04-21 14:20:56.000000000","message":".. code-block","commit_id":"b33a2d2ac42cc8c4d57b7fa07d35496fd540092e"},{"author":{"_account_id":16237,"name":"venkatamahesh","email":"venkatamaheshkotha@gmail.com","username":"venkatamahesh"},"change_message_id":"61773eb4879ba64bbcd85bf5b085990aef6bd1d5","unresolved":false,"context_lines":[{"line_number":56,"context_line":"   You need resolve a conflict by manually editing the file and"},{"line_number":57,"context_line":"   you will also need to delete the \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c\u0027, \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027, and\u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e\u0027"},{"line_number":58,"context_line":"   in the file and you need to add the files to the stage with"},{"line_number":59,"context_line":"   run :command:\u0027git add [filename]\u0027."},{"line_number":60,"context_line":""},{"line_number":61,"context_line":"#. Commit the changes after resolving the conflicts:"},{"line_number":62,"context_line":""}],"source_content_type":"text/x-rst","patch_set":3,"id":"1a122d0e_27224202","line":59,"range":{"start_line":59,"start_character":16,"end_line":59,"end_character":36},"updated":"2016-04-21 13:20:44.000000000","message":"`git add \u003cfile name\u003e`","commit_id":"b33a2d2ac42cc8c4d57b7fa07d35496fd540092e"},{"author":{"_account_id":19779,"name":"Chason Chan","display_name":"chenxing","email":"chason.chan@foxmail.com","username":"chenxing"},"change_message_id":"4362d6459a88da17e7f9deda20015e36bbe090fe","unresolved":false,"context_lines":[{"line_number":66,"context_line":""},{"line_number":67,"context_line":"#. Rebase the topic branch from master branch:"},{"line_number":68,"context_line":""},{"line_number":69,"context_line":"   .. Code-block:: console"},{"line_number":70,"context_line":""},{"line_number":71,"context_line":"      $ git rebase master"},{"line_number":72,"context_line":""}],"source_content_type":"text/x-rst","patch_set":3,"id":"1a122d0e_3f0fe22f","line":69,"range":{"start_line":69,"start_character":6,"end_line":69,"end_character":7},"updated":"2016-04-21 14:20:56.000000000","message":"code","commit_id":"b33a2d2ac42cc8c4d57b7fa07d35496fd540092e"},{"author":{"_account_id":16237,"name":"venkatamahesh","email":"venkatamaheshkotha@gmail.com","username":"venkatamahesh"},"change_message_id":"82c1a33736aca65fff5c81255a8c342dd878bed2","unresolved":false,"context_lines":[{"line_number":7,"context_line":"into another branch to resolve conflicts, when multiple commits"},{"line_number":8,"context_line":"happen on the same file."},{"line_number":9,"context_line":""},{"line_number":10,"context_line":".. Warning::"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"      Never do ``git rebase`` on public (master) branches."},{"line_number":13,"context_line":""}],"source_content_type":"text/x-rst","patch_set":4,"id":"dab17558_a03a5696","line":10,"range":{"start_line":10,"start_character":3,"end_line":10,"end_character":4},"updated":"2016-05-09 07:01:40.000000000","message":"use lowercase \u0027w\u0027","commit_id":"93bc26dfa7e3fc4bc69e4b68c0ff4a6196e206bd"},{"author":{"_account_id":19779,"name":"Chason Chan","display_name":"chenxing","email":"chason.chan@foxmail.com","username":"chenxing"},"change_message_id":"bbc8b8650f8d473cd08abc22cee04917f8cd4627","unresolved":false,"context_lines":[{"line_number":9,"context_line":""},{"line_number":10,"context_line":".. Warning::"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"      Never do ``git rebase`` on public (master) branches."},{"line_number":13,"context_line":""},{"line_number":14,"context_line":"#. Wait for the change to be merged into the master branch."},{"line_number":15,"context_line":""}],"source_content_type":"text/x-rst","patch_set":4,"id":"dab17558_4040caa5","line":12,"range":{"start_line":12,"start_character":3,"end_line":12,"end_character":6},"updated":"2016-05-09 07:14:13.000000000","message":"remove three spaces here","commit_id":"93bc26dfa7e3fc4bc69e4b68c0ff4a6196e206bd"},{"author":{"_account_id":16237,"name":"venkatamahesh","email":"venkatamaheshkotha@gmail.com","username":"venkatamahesh"},"change_message_id":"82c1a33736aca65fff5c81255a8c342dd878bed2","unresolved":false,"context_lines":[{"line_number":31,"context_line":""},{"line_number":32,"context_line":"      $ git commit"},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"#. Run :command:`tox`\u0027, then push the commit for review:"},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"   .. code-block:: console"},{"line_number":37,"context_line":""}],"source_content_type":"text/x-rst","patch_set":4,"id":"dab17558_c05e7ae8","line":34,"range":{"start_line":34,"start_character":21,"end_line":34,"end_character":22},"updated":"2016-05-09 07:01:40.000000000","message":"remove this","commit_id":"93bc26dfa7e3fc4bc69e4b68c0ff4a6196e206bd"},{"author":{"_account_id":16237,"name":"venkatamahesh","email":"venkatamaheshkotha@gmail.com","username":"venkatamahesh"},"change_message_id":"82c1a33736aca65fff5c81255a8c342dd878bed2","unresolved":false,"context_lines":[{"line_number":60,"context_line":""},{"line_number":61,"context_line":"#. Commit the changes after resolving the conflicts:"},{"line_number":62,"context_line":""},{"line_number":63,"context_line":"  .. code-block:: console"},{"line_number":64,"context_line":""},{"line_number":65,"context_line":"     $ git commit"},{"line_number":66,"context_line":""}],"source_content_type":"text/x-rst","patch_set":4,"id":"dab17558_c005dac2","line":63,"range":{"start_line":63,"start_character":0,"end_line":63,"end_character":2},"updated":"2016-05-09 07:01:40.000000000","message":"Add a bit space here","commit_id":"93bc26dfa7e3fc4bc69e4b68c0ff4a6196e206bd"},{"author":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"change_message_id":"da24ef4fcafe64092bfdabeccec59602584eed3e","unresolved":false,"context_lines":[{"line_number":53,"context_line":"   \u003d\u003d\u003d\u003d\u003d\u003d\u003d: Indicates separation of the two conflicting changes."},{"line_number":54,"context_line":"   \u003e\u003e\u003e\u003e\u003e\u003e\u003e: Indicates the end of the lines that had a merge conflict."},{"line_number":55,"context_line":""},{"line_number":56,"context_line":"   You need resolve a conflict by manually editing the file and"},{"line_number":57,"context_line":"   you will also need to delete the \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c\u0027, \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027, and\u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e\u0027"},{"line_number":58,"context_line":"   in the file and you need to add the files to the stage with"},{"line_number":59,"context_line":"   run :command:`git add \u003cfilename\u003e`."}],"source_content_type":"text/x-rst","patch_set":5,"id":"dab17558_bb0e8938","line":56,"range":{"start_line":56,"start_character":59,"end_line":56,"end_character":63},"updated":"2016-05-17 10:59:21.000000000","message":"\"...file. You also need to delete...\" (separate the sentences)","commit_id":"0b8166c5bf620907cbb9c328a6dbb150f9de3089"},{"author":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"change_message_id":"da24ef4fcafe64092bfdabeccec59602584eed3e","unresolved":false,"context_lines":[{"line_number":55,"context_line":""},{"line_number":56,"context_line":"   You need resolve a conflict by manually editing the file and"},{"line_number":57,"context_line":"   you will also need to delete the \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c\u0027, \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027, and\u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e\u0027"},{"line_number":58,"context_line":"   in the file and you need to add the files to the stage with"},{"line_number":59,"context_line":"   run :command:`git add \u003cfilename\u003e`."},{"line_number":60,"context_line":""},{"line_number":61,"context_line":"#. Commit the changes after resolving the conflicts:"}],"source_content_type":"text/x-rst","patch_set":5,"id":"dab17558_9b090534","line":58,"range":{"start_line":58,"start_character":19,"end_line":58,"end_character":30},"updated":"2016-05-17 10:59:21.000000000","message":"remove","commit_id":"0b8166c5bf620907cbb9c328a6dbb150f9de3089"},{"author":{"_account_id":19779,"name":"Chason Chan","display_name":"chenxing","email":"chason.chan@foxmail.com","username":"chenxing"},"change_message_id":"8cfe43c21dbf44d248e2c2b45900efddefc0bda2","unresolved":false,"context_lines":[{"line_number":3,"context_line":"Resolving merge conflicts"},{"line_number":4,"context_line":"~~~~~~~~~~~~~~~~~~~~~~~~~"},{"line_number":5,"context_line":""},{"line_number":6,"context_line":"``Git Rebase`` is used to integrate changes from one branch"},{"line_number":7,"context_line":"into another branch to resolve conflicts, when multiple commits"},{"line_number":8,"context_line":"happen on the same file."},{"line_number":9,"context_line":""}],"source_content_type":"text/x-rst","patch_set":6,"id":"bab6814e_2ea27dae","line":6,"range":{"start_line":6,"start_character":2,"end_line":6,"end_character":12},"updated":"2016-05-26 15:29:21.000000000","message":"should be consistent with the line 12.\ns/Git Rebase/git rebase/g","commit_id":"5b564100360d3e0213ea829c9ba4c5ed69865db1"},{"author":{"_account_id":10897,"name":"Joseph Robinson","email":"josephremail@gmail.com","username":"RobiJoe"},"change_message_id":"c4c55aa21cdffdf5de34c60d3124dbf2a7c88c8d","unresolved":false,"context_lines":[{"line_number":77,"context_line":"   \u003e\u003e\u003e\u003e\u003e\u003e\u003e: Indicates the end of the lines that had a merge conflict."},{"line_number":78,"context_line":""},{"line_number":79,"context_line":"   You need to resolve a conflict by manually editing the file."},{"line_number":80,"context_line":"   You also need to delete the \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c\u0027, \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027, and\u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e\u0027"},{"line_number":81,"context_line":"   in the file and add the files to the stage with"},{"line_number":82,"context_line":"   run :command:`git add \u003cfilename\u003e`."},{"line_number":83,"context_line":""}],"source_content_type":"text/x-rst","patch_set":6,"id":"bab6814e_4d6b7185","line":80,"updated":"2016-05-27 00:45:07.000000000","message":"[Optional] - Just to clarify, add a sentence on line 80 that specifies what to change.\n\n\"The content between \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c HEAD\u0027 and \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027 represents the current state of the repository, and you will need to integrate or delete this content with your changes, which are between the \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027 and \u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e feature/topic\u0027 branch.\"","commit_id":"5b564100360d3e0213ea829c9ba4c5ed69865db1"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"a3250e26e85eda3f15b25db780c4656154a1b684","unresolved":false,"context_lines":[{"line_number":3,"context_line":"Resolving merge conflicts"},{"line_number":4,"context_line":"~~~~~~~~~~~~~~~~~~~~~~~~~"},{"line_number":5,"context_line":""},{"line_number":6,"context_line":"``git rebase`` is used to integrate changes from one branch"},{"line_number":7,"context_line":"into another branch to resolve conflicts, when multiple commits"},{"line_number":8,"context_line":"happen on the same file."},{"line_number":9,"context_line":""},{"line_number":10,"context_line":".. warning::"},{"line_number":11,"context_line":""}],"source_content_type":"text/x-rst","patch_set":7,"id":"9abb7d3a_07ee1c8b","line":8,"range":{"start_line":6,"start_character":0,"end_line":8,"end_character":24},"updated":"2016-05-27 12:54:49.000000000","message":"I would rewrite to something like: \n\nIf the change that you submitted has a merge conflict, you need to manually resolve it using the :command:`git rebase` command. Rebasing is used to integrate changes from one branch into another to resolve conflicts when multiple commits happen on the same file.","commit_id":"d18dba7f1b6ec505a2c5badb4a2799588ae915ec"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"a3250e26e85eda3f15b25db780c4656154a1b684","unresolved":false,"context_lines":[{"line_number":9,"context_line":""},{"line_number":10,"context_line":".. warning::"},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"   Never do ``git rebase`` on public (master) branches."},{"line_number":13,"context_line":""},{"line_number":14,"context_line":"#. Wait for the change to be merged into the master branch."},{"line_number":15,"context_line":""}],"source_content_type":"text/x-rst","patch_set":7,"id":"9abb7d3a_81a31c9e","line":12,"range":{"start_line":12,"start_character":12,"end_line":12,"end_character":26},"updated":"2016-05-27 12:54:49.000000000","message":"a rebase\n\nor:\n\n:command:`git rebase`","commit_id":"d18dba7f1b6ec505a2c5badb4a2799588ae915ec"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"a3250e26e85eda3f15b25db780c4656154a1b684","unresolved":false,"context_lines":[{"line_number":11,"context_line":""},{"line_number":12,"context_line":"   Never do ``git rebase`` on public (master) branches."},{"line_number":13,"context_line":""},{"line_number":14,"context_line":"#. Wait for the change to be merged into the master branch."},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"#. Make sure your repository is up to date:"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"   .. code-block:: console"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"      $ git fetch origin"},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"#. Create a topic branch by branching from master branch:"},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"   .. code-block:: console"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"      $ git checkout -b CHANGENUMBER remotes/origin/master"},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"#. Commit the changes for the new fix:"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"   .. code-block:: console"},{"line_number":31,"context_line":""},{"line_number":32,"context_line":"      $ git commit"},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"#. Run :command:`tox`, then push the commit for review:"},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"   .. code-block:: console"},{"line_number":37,"context_line":""},{"line_number":38,"context_line":"      $ git review"},{"line_number":39,"context_line":""},{"line_number":40,"context_line":"#. Somebody else submits a change and that change merges."},{"line_number":41,"context_line":"   Now your change has a merge conflict."}],"source_content_type":"text/x-rst","patch_set":7,"id":"9abb7d3a_21b070f4","line":38,"range":{"start_line":14,"start_character":0,"end_line":38,"end_character":18},"updated":"2016-05-27 12:54:49.000000000","message":"I\u0027m not sure all those steps have to be described here. I would adhere to the workflow Andreas commented in Patch Set 3.","commit_id":"d18dba7f1b6ec505a2c5badb4a2799588ae915ec"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"a3250e26e85eda3f15b25db780c4656154a1b684","unresolved":false,"context_lines":[{"line_number":78,"context_line":""},{"line_number":79,"context_line":"   You need to resolve a conflict by manually editing the file."},{"line_number":80,"context_line":"   You also need to delete the \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c\u0027, \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027, and\u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e\u0027"},{"line_number":81,"context_line":"   in the file and add the files to the stage with"},{"line_number":82,"context_line":"   run :command:`git add \u003cfilename\u003e`."},{"line_number":83,"context_line":""},{"line_number":84,"context_line":"#. Commit the changes after resolving the conflicts:"},{"line_number":85,"context_line":""}],"source_content_type":"text/x-rst","patch_set":7,"id":"9abb7d3a_e1edc826","line":82,"range":{"start_line":81,"start_character":19,"end_line":82,"end_character":37},"updated":"2016-05-27 12:54:49.000000000","message":"This can be a separate step.","commit_id":"d18dba7f1b6ec505a2c5badb4a2799588ae915ec"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"a3250e26e85eda3f15b25db780c4656154a1b684","unresolved":false,"context_lines":[{"line_number":78,"context_line":""},{"line_number":79,"context_line":"   You need to resolve a conflict by manually editing the file."},{"line_number":80,"context_line":"   You also need to delete the \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c\u0027, \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027, and\u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e\u0027"},{"line_number":81,"context_line":"   in the file and add the files to the stage with"},{"line_number":82,"context_line":"   run :command:`git add \u003cfilename\u003e`."},{"line_number":83,"context_line":""},{"line_number":84,"context_line":"#. Commit the changes after resolving the conflicts:"},{"line_number":85,"context_line":""}],"source_content_type":"text/x-rst","patch_set":7,"id":"9abb7d3a_01828c52","line":82,"range":{"start_line":81,"start_character":46,"end_line":82,"end_character":6},"updated":"2016-05-27 12:54:49.000000000","message":"by running","commit_id":"d18dba7f1b6ec505a2c5badb4a2799588ae915ec"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"a3250e26e85eda3f15b25db780c4656154a1b684","unresolved":false,"context_lines":[{"line_number":81,"context_line":"   in the file and add the files to the stage with"},{"line_number":82,"context_line":"   run :command:`git add \u003cfilename\u003e`."},{"line_number":83,"context_line":""},{"line_number":84,"context_line":"#. Commit the changes after resolving the conflicts:"},{"line_number":85,"context_line":""},{"line_number":86,"context_line":"   .. code-block:: console"},{"line_number":87,"context_line":""}],"source_content_type":"text/x-rst","patch_set":7,"id":"9abb7d3a_41cad4a2","line":84,"range":{"start_line":84,"start_character":22,"end_line":84,"end_character":51},"updated":"2016-05-27 12:54:49.000000000","message":"can be removed","commit_id":"d18dba7f1b6ec505a2c5badb4a2799588ae915ec"},{"author":{"_account_id":14947,"name":"Maria Zlatkova","email":"mzlatkova@mirantis.com","username":"mzlatkova"},"change_message_id":"a3250e26e85eda3f15b25db780c4656154a1b684","unresolved":false,"context_lines":[{"line_number":93,"context_line":""},{"line_number":94,"context_line":"      $ git rebase --continue"},{"line_number":95,"context_line":""},{"line_number":96,"context_line":"#. Send rebased patch again for review:"},{"line_number":97,"context_line":""},{"line_number":98,"context_line":"   .. code-block:: console"},{"line_number":99,"context_line":""}],"source_content_type":"text/x-rst","patch_set":7,"id":"9abb7d3a_61c1d880","line":96,"range":{"start_line":96,"start_character":8,"end_line":96,"end_character":15},"updated":"2016-05-27 12:54:49.000000000","message":"the rebased","commit_id":"d18dba7f1b6ec505a2c5badb4a2799588ae915ec"},{"author":{"_account_id":964,"name":"Anne Gentle","email":"annegentle@justwriteclick.com","username":"annegentle"},"change_message_id":"30a1cef68ffbeee12ad7d5dd812d063cc3411014","unresolved":false,"context_lines":[{"line_number":4,"context_line":"~~~~~~~~~~~~~~~~~~~~~~~~~"},{"line_number":5,"context_line":""},{"line_number":6,"context_line":"If the change that you submitted has a merge conflict,"},{"line_number":7,"context_line":"you need to manually resolve it using the :command:`git rebase`."},{"line_number":8,"context_line":""},{"line_number":9,"context_line":"Rebasing is used to integrate changes from one branch into another to"},{"line_number":10,"context_line":"resolve conflicts when multiple commits happen on the same file."}],"source_content_type":"text/x-rst","patch_set":8,"id":"5a9d85d2_966252ac","line":7,"updated":"2016-06-19 03:05:08.000000000","message":"I would delete the \"the\" because it\u0027ll read as \"the git rebase\" when rendered. If you like using the you could write as, \"using the :command:`git rebase` command.\"","commit_id":"70bbe33e8d7ae939425868c724c322eadec5f540"},{"author":{"_account_id":964,"name":"Anne Gentle","email":"annegentle@justwriteclick.com","username":"annegentle"},"change_message_id":"30a1cef68ffbeee12ad7d5dd812d063cc3411014","unresolved":false,"context_lines":[{"line_number":52,"context_line":""},{"line_number":53,"context_line":"   \u003c\u003c\u003c\u003c\u003c\u003c\u003c: Indicates the start of the lines that had a merge conflict."},{"line_number":54,"context_line":"   \u003d\u003d\u003d\u003d\u003d\u003d\u003d: Indicates separation of the two conflicting changes."},{"line_number":55,"context_line":"   \u003e\u003e\u003e\u003e\u003e\u003e\u003e: Indicates the end of the lines that had a merge conflict."},{"line_number":56,"context_line":""},{"line_number":57,"context_line":"   You need to resolve a conflict by manually editing the file."},{"line_number":58,"context_line":"   You also need to delete the \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c\u0027, \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027, and\u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e\u0027"}],"source_content_type":"text/x-rst","patch_set":8,"id":"5a9d85d2_5652aade","line":55,"updated":"2016-06-19 03:05:08.000000000","message":"In the output at http://docs-draft.openstack.org/15/305115/8/check/gate-openstack-manuals-tox-doc-publish-checkbuild/630e7da//publish-docs/contributor-guide/additional-git-workflow/rebase.html these are all on one line -- put an extra break between each to make a listing.","commit_id":"70bbe33e8d7ae939425868c724c322eadec5f540"},{"author":{"_account_id":964,"name":"Anne Gentle","email":"annegentle@justwriteclick.com","username":"annegentle"},"change_message_id":"30a1cef68ffbeee12ad7d5dd812d063cc3411014","unresolved":false,"context_lines":[{"line_number":56,"context_line":""},{"line_number":57,"context_line":"   You need to resolve a conflict by manually editing the file."},{"line_number":58,"context_line":"   You also need to delete the \u0027\u003c\u003c\u003c\u003c\u003c\u003c\u003c\u0027, \u0027\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u0027, and\u0027\u003e\u003e\u003e\u003e\u003e\u003e\u003e\u0027"},{"line_number":59,"context_line":"   in the file. add the files to the stage by"},{"line_number":60,"context_line":"   running :command:`git add \u003cfilename\u003e`."},{"line_number":61,"context_line":""},{"line_number":62,"context_line":"#. Commit the changes:"}],"source_content_type":"text/x-rst","patch_set":8,"id":"5a9d85d2_1648222d","line":59,"updated":"2016-06-19 03:05:08.000000000","message":"Add the files (capital A)","commit_id":"70bbe33e8d7ae939425868c724c322eadec5f540"},{"author":{"_account_id":964,"name":"Anne Gentle","email":"annegentle@justwriteclick.com","username":"annegentle"},"change_message_id":"30a1cef68ffbeee12ad7d5dd812d063cc3411014","unresolved":false,"context_lines":[{"line_number":76,"context_line":"   .. code-block:: console"},{"line_number":77,"context_line":""},{"line_number":78,"context_line":"      $ git review"},{"line_number":79,"context_line":""}],"source_content_type":"text/x-rst","patch_set":8,"id":"5a9d85d2_765526c5","line":79,"updated":"2016-06-19 03:05:08.000000000","message":"Looks great! I would suggest a final paragraph that states what they should expect to see with a successful git review command, such as the original review.openstack.org URL.","commit_id":"70bbe33e8d7ae939425868c724c322eadec5f540"}]}