)]}'
{
  "commit": "1f834ad6f02001d7ef7267f174e49d9c36506326",
  "tree": "126ee3c45196e66a7b273d7a51ddb269919dcafe",
  "parents": [
    "417233022d791cfaeb298efca40e971b62250e1b"
  ],
  "author": {
    "name": "Edwin Kempin",
    "email": "ekempin@google.com",
    "time": "Wed Jan 15 12:11:20 2020 +0100"
  },
  "committer": {
    "name": "Edwin Kempin",
    "email": "ekempin@google.com",
    "time": "Wed Jan 15 15:24:37 2020 +0100"
  },
  "message": "Do not fail with 500 ISE if base of merge change cannot be computed due to NoMergeBaseException\n\nIf the repository content doesn\u0027t allow us to compute an auto-merge\ncommit for the base of a merge change because JGit cannot find a merge\nbase (e.g. due to CONFLICTS_DURING_MERGE_BASE_CALCULATION), we now\nreturn \u0027409 Conflict\u0027 for the ListFiles and change-edit-related REST\nendpoints. If the files were supposed to be included into a ChangeInfo /\nRevisionInfo we ignore the failure and just do not populate the file\nlist (but we log a warning). Letting the request succeed in this case is\nbetter, as the caller can at least get the rest of the change and\nrevision information.\n\nTreating NoMergeBaseException as \u0027409 Conflict\u0027 is consistent with how\nwe treat this exception in other places (e.g. in the CreateChange REST\nendpoint).\n\nChange-Id: I78b4636c23635048eedf2a1e4b1075eb87ecb262\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "a82397545a71eb904c1f208e33d7ece43ede27e5",
      "old_mode": 33188,
      "old_path": "java/com/google/gerrit/server/change/FileInfoJson.java",
      "new_id": "aca4fb0c0d9419e1083a8df8673b78adacff4fc9",
      "new_mode": 33188,
      "new_path": "java/com/google/gerrit/server/change/FileInfoJson.java"
    },
    {
      "type": "modify",
      "old_id": "fbd14c44288b85e06d8dccb27270c1cb2a93ee87",
      "old_mode": 33188,
      "old_path": "java/com/google/gerrit/server/change/RevisionJson.java",
      "new_id": "a4994fddcd9d214fcfb972050ebb20447d921a30",
      "new_mode": 33188,
      "new_path": "java/com/google/gerrit/server/change/RevisionJson.java"
    },
    {
      "type": "modify",
      "old_id": "aa36b73e27856c789dfc88b7c344e8aba8811599",
      "old_mode": 33188,
      "old_path": "java/com/google/gerrit/server/restapi/change/ChangeEdits.java",
      "new_id": "5adb75afedbd6b11d677b639f08e62c64c915aca",
      "new_mode": 33188,
      "new_path": "java/com/google/gerrit/server/restapi/change/ChangeEdits.java"
    },
    {
      "type": "modify",
      "old_id": "0ee82795ea7cc23ef5182f8ff81eaaf016c8c12a",
      "old_mode": 33188,
      "old_path": "java/com/google/gerrit/server/restapi/project/FilesInCommitCollection.java",
      "new_id": "0d5ab885d652e470eb7503b9fe3cf602353f10ea",
      "new_mode": 33188,
      "new_path": "java/com/google/gerrit/server/restapi/project/FilesInCommitCollection.java"
    }
  ]
}