)]}'
{
  "commit": "59ba4293679dbed20a6d67fc3eff88d8f98eda43",
  "tree": "7d5e23bbce37c631139bcf11a17ae50287d34132",
  "parents": [
    "85ba5745afcc646c1728dbb690bfb196537abe04"
  ],
  "author": {
    "name": "Valentin Stanciu",
    "email": "250871+svalentin@users.noreply.github.com",
    "time": "Tue Jul 04 19:40:46 2023 +0100"
  },
  "committer": {
    "name": "GitHub",
    "email": "noreply@github.com",
    "time": "Tue Jul 04 19:40:46 2023 +0100"
  },
  "message": "When sync-typeshed fails to apply CP allow manual user merges (#15591)\n\nIf misc/sync-typeshed.py fails to apply a cherry pick, it just fails.\r\nLet\u0027s try to give the user a chance to manually merge the CP and\r\ncontinue with the script.\r\nThis should block for user input only in cases where stdin is a tty. So\r\nautomation should continue failing. (but the only way to test is by\r\nrunning it)\r\n\r\n---------\r\n\r\nCo-authored-by: pre-commit-ci[bot] \u003c66853113+pre-commit-ci[bot]@users.noreply.github.com\u003e\r\nCo-authored-by: Alex Waygood \u003cAlex.Waygood@Gmail.com\u003e",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "a8aca425696a9d08aa68810801a2e1c199febd9a",
      "old_mode": 33188,
      "old_path": "misc/sync-typeshed.py",
      "new_id": "cbaa7029620f4807765d691cefe7dd2dca3ac728",
      "new_mode": 33188,
      "new_path": "misc/sync-typeshed.py"
    }
  ]
}
