)]}'
{"/PATCHSET_LEVEL":[{"author":{"_account_id":2475,"name":"Antoine Musso","email":"hashar@free.fr","username":"hashar"},"change_message_id":"1dccaffecba97f9c766b3a384adcf0591b257a91","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":2,"id":"40ce09e3_32274fc4","updated":"2025-07-16 09:49:54.000000000","message":"One drawback of `git-cherry` is that if a change got merged after a conflict resolution was performed, the diff is different and it will not find it.\n\nAn alternative is to compare the list of `Change-Id` in the local review branch with the one in the tracked branch.\n\nWe can get the one from the review branch with:\n```\ngit log HEAD@{u}..HEAD --format\u003d\u0027%(trailers:key\u003dChange-Id,valueonly,separator)\u0027\n```\nAnd the one merged since by looking at the merge base:\n```\ngit log HEAD@{u}...HEAD --format\u003d\u0027%(trailers:key\u003dChange-Id,valueonly,separator)\u0027\n```\n\nThen assert everything from the first set is in the second 😊","commit_id":"56af94a3a53b3edec6299c3a0dc88a63392e9f5b"}]}
