)]}'
{
  "commit": "706483fd6398f00fd4faba73812de9bf15728086",
  "tree": "68959ddd3455885468c0e75f654b5b7afdcb2d16",
  "parents": [
    "bb58bae418d8ff5d3c325cb522766af0f9912b76"
  ],
  "author": {
    "name": "messa",
    "email": "messa@google.com",
    "time": "Tue Jul 13 04:05:39 2021 -0700"
  },
  "committer": {
    "name": "fweikert",
    "email": "fwe@google.com",
    "time": "Fri Jul 16 12:53:17 2021 +0200"
  },
  "message": "Resolve merge conflict\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "2a8445a50351574520a16cf6f1113e19c26243a4",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java",
      "new_id": "1e8a0ef29f5cf0ae4506b29eeb6ed7df274490e3",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/analysis/AnalysisFailureEvent.java"
    },
    {
      "type": "modify",
      "old_id": "f835927ef56fa07bcdbe98511d455ef7d6cb2e1c",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/analysis/BuildView.java",
      "new_id": "bec43a1036d6bfe7d05123e48676ca119452d1d8",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/analysis/BuildView.java"
    },
    {
      "type": "modify",
      "old_id": "aea1e90fe8707fbe472aa6489a0d9e13044e101c",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java",
      "new_id": "46519cb9097a88b134b35cbadf96af243d39e390",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java"
    },
    {
      "type": "modify",
      "old_id": "bf0b414e875cdfd025ed143861dff32a73e8966c",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/packages/StarlarkAspectClass.java",
      "new_id": "2b9f2a3d8bfef6de1d9a99642885cad1d91d6053",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/packages/StarlarkAspectClass.java"
    },
    {
      "type": "modify",
      "old_id": "f97e08d746ac855b5f8d4f523036584accc6e8b0",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java",
      "new_id": "04c15bdca24ddab06642792ac9100c2d8aa3b06d",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java"
    },
    {
      "type": "modify",
      "old_id": "2fd26d1221d53f1a479f6298d7e362e481a24d5c",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/BUILD",
      "new_id": "6eaa548810e821f09798d0c60f3b14b563620736",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/BUILD"
    },
    {
      "type": "delete",
      "old_id": "4d81910f6e500ea4351277878c68fb8489fb3099",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/LoadStarlarkAspectFunction.java",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "modify",
      "old_id": "46443e4d3dc9a0ec84cb16fe8a9d43cd8f0f6b63",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java",
      "new_id": "cb07796b36619249c1ca9c124465221b8f60536b",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java"
    },
    {
      "type": "modify",
      "old_id": "c6d559b4dfcd594e9d68a0324f8c2bf6bc496957",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java",
      "new_id": "fdd704395197c6f35bec7241e062eaeb42943e7a",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java"
    },
    {
      "type": "modify",
      "old_id": "780cdceb7566738a85a9dcc8d7fc3191a1fdc31f",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java",
      "new_id": "af7eb2756f4c7a2c11ddbd481efabcfb5c9c2db2",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java"
    },
    {
      "type": "modify",
      "old_id": "693bde758f4f643a557b0311b140d6ca833fca31",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/TargetCycleReporter.java",
      "new_id": "cf8f8285f1bb0b5b671a247cd2745fd39a8910fe",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/TargetCycleReporter.java"
    },
    {
      "type": "modify",
      "old_id": "5638d8e9c64a1fba61eefd3a6279d28bc3622704",
      "old_mode": 33188,
      "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/ToplevelStarlarkAspectFunction.java",
      "new_id": "a858e35e351abdef9f23ded77c3a891b975bc808",
      "new_mode": 33188,
      "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/ToplevelStarlarkAspectFunction.java"
    },
    {
      "type": "modify",
      "old_id": "e6e59298bc3152ddedb14726ba0e8cecdf51cc59",
      "old_mode": 33188,
      "old_path": "src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java",
      "new_id": "e39c708f55011568b31ccdd903a30ea11ec89dbe",
      "new_mode": 33188,
      "new_path": "src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java"
    },
    {
      "type": "modify",
      "old_id": "f491beac037b4e7477b7a2e7660039061ff08c9a",
      "old_mode": 33188,
      "old_path": "src/test/java/com/google/devtools/build/lib/skyframe/TargetCycleReporterTest.java",
      "new_id": "17ec74063c813f1b6551153b727a3a01a551f13c",
      "new_mode": 33188,
      "new_path": "src/test/java/com/google/devtools/build/lib/skyframe/TargetCycleReporterTest.java"
    },
    {
      "type": "modify",
      "old_id": "375e8a8b40caead91998689d21a2d2f6ea79309c",
      "old_mode": 33188,
      "old_path": "src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java",
      "new_id": "e74bb4d67e0ca264b04cbf46a2aa116dbda7a829",
      "new_mode": 33188,
      "new_path": "src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java"
    }
  ]
}