)]}'
{"doc/contributor-guide/source/quickstart/first-timers.rst":[{"author":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"change_message_id":"d12132f2891f60109cbd4bd674c1cbe7fe6bd6c1","unresolved":false,"context_lines":[{"line_number":278,"context_line":""},{"line_number":279,"context_line":"  On Windows, look for it in the same location."},{"line_number":280,"context_line":""},{"line_number":281,"context_line":"* You have a merge conflict, and your patch needs to be rebased"},{"line_number":282,"context_line":""},{"line_number":283,"context_line":"  Sometimes your change will create a merge conflict with another patch."},{"line_number":284,"context_line":"  In this case, you will need to rebase your commit on top of the current"}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a1ced50_d8459d17","line":281,"range":{"start_line":281,"start_character":56,"end_line":281,"end_character":63},"updated":"2017-03-20 15:33:00.000000000","message":"rebased. *","commit_id":"dbbd84704a283c82405f38a3b3a3fa9fba5ac4ef"},{"author":{"_account_id":9162,"name":"Lana Brindley","email":"openstack@lanabrindley.com","username":"loquacity"},"change_message_id":"f7a3261c4a97101820acbcaddc99f033aa95afeb","unresolved":false,"context_lines":[{"line_number":278,"context_line":""},{"line_number":279,"context_line":"  On Windows, look for it in the same location."},{"line_number":280,"context_line":""},{"line_number":281,"context_line":"* You have a merge conflict, and your patch needs to be rebased"},{"line_number":282,"context_line":""},{"line_number":283,"context_line":"  Sometimes your change will create a merge conflict with another patch."},{"line_number":284,"context_line":"  In this case, you will need to rebase your commit on top of the current"}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a1ced50_90ba0c6d","line":281,"range":{"start_line":281,"start_character":56,"end_line":281,"end_character":63},"in_reply_to":"1a1ced50_d8459d17","updated":"2017-03-20 23:04:49.000000000","message":"It\u0027s not a full sentence. We should take the period off the other bullets instead.","commit_id":"dbbd84704a283c82405f38a3b3a3fa9fba5ac4ef"},{"author":{"_account_id":12686,"name":"Brian Moss","email":"kallimachos@gmail.com","username":"bmoss"},"change_message_id":"61a7e4a0d5568cc7e3c81cb9cb79dab3ab9f7abd","unresolved":false,"context_lines":[{"line_number":286,"context_line":"  the ``Rebase`` button in the gerrit interface. If this fails, though, you"},{"line_number":287,"context_line":"  will need to perform it manually. Instructions are in the"},{"line_number":288,"context_line":"  `Infra Manual \u003chttps://docs.openstack.org/infra/manual/developers.html#understanding-changes-and-patch-sets\u003e_`"},{"line_number":289,"context_line":""},{"line_number":290,"context_line":""},{"line_number":291,"context_line":"Network"},{"line_number":292,"context_line":"-------"}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a1ced50_cde1789c","line":289,"updated":"2017-03-20 02:31:02.000000000","message":"I wonder if we should also link to something that deals with resolving conflicts after rebasing explicitly? For example:\n\nhttps://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/\n\nWhich also helpfully links to an article on solving merge conflicts generally.","commit_id":"dbbd84704a283c82405f38a3b3a3fa9fba5ac4ef"},{"author":{"_account_id":9162,"name":"Lana Brindley","email":"openstack@lanabrindley.com","username":"loquacity"},"change_message_id":"f7a3261c4a97101820acbcaddc99f033aa95afeb","unresolved":false,"context_lines":[{"line_number":286,"context_line":"  the ``Rebase`` button in the gerrit interface. If this fails, though, you"},{"line_number":287,"context_line":"  will need to perform it manually. Instructions are in the"},{"line_number":288,"context_line":"  `Infra Manual \u003chttps://docs.openstack.org/infra/manual/developers.html#understanding-changes-and-patch-sets\u003e_`"},{"line_number":289,"context_line":""},{"line_number":290,"context_line":""},{"line_number":291,"context_line":"Network"},{"line_number":292,"context_line":"-------"}],"source_content_type":"text/x-rst","patch_set":2,"id":"1a1ced50_b0b1c891","line":289,"in_reply_to":"1a1ced50_cde1789c","updated":"2017-03-20 23:04:49.000000000","message":"Sure. Patches welcome ;) (Or I\u0027ll circle back later today)","commit_id":"dbbd84704a283c82405f38a3b3a3fa9fba5ac4ef"}]}