)]}'
{"/PATCHSET_LEVEL":[{"author":{"_account_id":7233,"name":"Matthew Oliver","email":"matt@oliver.net.au","username":"mattoliverau"},"change_message_id":"9018e2d2785e1160159b5b7f4ad45460b860918f","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"d65b88c1_a12cc340","updated":"2025-02-17 05:11:29.000000000","message":"This should\u0027ve been a new patchset on the parent change not a follow up patch in a chain. They\u0027re both similar but different.\nWe could just squash this into the parent at this point to fix up the pep8s.\n\nIn essence, the Change-Id that is automatically added to the change in the commit message it what determines that change it is in gerrit. So normally to fix a pep8 issues and address review feedback you just make the changes, but instead of commiting a new change you:\n\n```\ngit add \u003cfile1, file2, ..\u003e\ngit commit --amend\n```\n\nThe ammend will ammend and add the changes to the change at the HEAD of the repo (your last change in the branch). \n\nThen when you\u0027re ready to push it up as a new patchset in gerrit just:\n\n```\ngit review\n```\n\nIn gerrit the patch will now have a new patchset. Don\u0027t worry about loosing anything about your last patchset even though you overwrote it locally, we can always pull down a patch at a different patchset. So gerrit maintains the history for us.\n\n\nIf you want to squash this into the parent. You can do a internactive rebase:\n\n```\ngit rebase -i HEAD~2\n```\n\nThere I\u0027m just looking at the last 2 commits. I can then tell the last one (this one) to squash into the parent. BUT remember the Change-Id is king. So as you sqaush, make sure you leave the original Change-Id and remove this ones, otherwise things might get a little interesting.\n\nHappy to give a demo about all this tomorrow if you all want one.","commit_id":"52be9a77b12e55bb0e2f26e9551f41f4f7059771"}]}