)]}'
{
  "commit": "c9a52af3210d2c5ddf22383e9e1d580afa38a071",
  "tree": "160ca206d9e23bb9d878c189a31d930bbc524bc1",
  "parents": [
    "d708426dde9146a409fd74aa4a4a2c7f41747452"
  ],
  "author": {
    "name": "mjtalbot",
    "email": "hello@rive.app",
    "time": "Fri Feb 16 10:47:45 2024 +0000"
  },
  "committer": {
    "name": "Maxwell Talbot",
    "email": "talbot.maxwell@gmail.com",
    "time": "Fri Feb 16 11:03:27 2024 +0000"
  },
  "message": "Pushing merge, resolved using upstream.\\n\\n message\u003dupdate mono to keep details in commit and not pr\n\ngonna double check it and merge it...\n\nprevious job failed on hte pr message, probably too complex\n\nhttps://github.com/rive-app/rive/actions/runs/7929209375/job/21648989390\n\n```\n+ gh pr create --fill --title \u0027There have been merge conflicts\u0027 --body \u0027diff --cc .github/workflows/tests.yml\nindex 76659125,e20119eb..00000000\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@@ -58,8 -58,9 +58,12 @@@ jobs\n          run: |\n            cd dev/test\n            C:\\premake5.exe --scripts\u003d..\\..\\build vs2022\n++\u003c\u003c\u003c\u003c\u003c\u003c\u003c ours\n++\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n+           cd out/debug\n++\u003e\u003e\u003e\u003e\u003e\u003e\u003e theirs\n            MSBuild rive.sln\n-           build\\bin\\debug\\tests.exe\n+           tests.exe\n\n    build-macos:\n      runs-on: macOS-latest\u0027\npull request create failed: GraphQL: Something went wrong while executing your query. Please include `16C0:22C1:77BF52E:7B4322F:65CF3854` when reporting this issue.\n```\n\nDiffs\u003d\n6059f744d update mono to keep details in commit and not pr (#6637)\na394393a0 update mono scripts to be able to create \"fixing\" pr (#6636)\n2277c08fc Apply same changes as downstream (#6634)\nfaf6ea317 Option to build harfbuzz with renames to avoid static lib collision. (#6630)\nc51bda03e Fix downstream windows tests. (#6632)\n\nCo-authored-by: Luigi Rosso \u003cluigi-rosso@users.noreply.github.com\u003e\nCo-authored-by: Maxwell Talbot \u003ctalbot.maxwell@gmail.com\u003e diff\u003d\\n\\ndiff --cc .github/workflows/tests.yml\nindex 76659125,e20119eb..00000000\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@@ -58,8 -58,9 +58,12 @@@ jobs\n          run: |\n            cd dev/test\n            C:\\premake5.exe --scripts\u003d..\\..\\build vs2022\n++\u003c\u003c\u003c\u003c\u003c\u003c\u003c ours\n++\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n+           cd out/debug\n++\u003e\u003e\u003e\u003e\u003e\u003e\u003e theirs\n            MSBuild rive.sln\n-           build\\bin\\debug\\tests.exe\n+           tests.exe\n\n    build-macos:\n      runs-on: macOS-latest\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "76659125c60d748b8f8e6a94ce5a3a69622f2930",
      "old_mode": 33188,
      "old_path": ".github/workflows/tests.yml",
      "new_id": "e20119eb7da4a774fbc6cc015603ddd0ca3023a8",
      "new_mode": 33188,
      "new_path": ".github/workflows/tests.yml"
    },
    {
      "type": "modify",
      "old_id": "b535eeaa79e92e06445218c5f93afb2dfaa2de91",
      "old_mode": 33188,
      "old_path": ".rive_head",
      "new_id": "c6cbfd56737fb330524c7a41d073b5a97ae4ff38",
      "new_mode": 33188,
      "new_path": ".rive_head"
    },
    {
      "type": "modify",
      "old_id": "6c99f30af45ad05a9409066c7fa1fb9c8aafeadc",
      "old_mode": 33188,
      "old_path": "README.md",
      "new_id": "c8048ee130c83e3c4a21b03ace3d11fbb865e53e",
      "new_mode": 33188,
      "new_path": "README.md"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "e0c6b4dfe26f7ce01e7ac4b22210001847af565e",
      "new_mode": 33188,
      "new_path": "dependencies/gen_harfbuzz_renames/gen_header.dart"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "1900497b261c3d615d06c7d9802394c03119776d",
      "new_mode": 33261,
      "new_path": "dependencies/gen_harfbuzz_renames/gen_renames.sh"
    },
    {
      "type": "modify",
      "old_id": "f5e417951845e719f5e2ddcc93ffedd67669cd9d",
      "old_mode": 33188,
      "old_path": "dependencies/premake5_harfbuzz_v2.lua",
      "new_id": "678f1a2dab423d2343e69b3490d3ec1238d3be76",
      "new_mode": 33188,
      "new_path": "dependencies/premake5_harfbuzz_v2.lua"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "8e6e77ad47bb865f268c6490f5b9a672fbbe0ed6",
      "new_mode": 33188,
      "new_path": "dependencies/rive_harfbuzz_renames.h"
    },
    {
      "type": "modify",
      "old_id": "400bd6eae58f80b1cecbc6cd229334b8da908b40",
      "old_mode": 33188,
      "old_path": "premake5_v2.lua",
      "new_id": "0787eddcb83b65b2b508e66f74ccab81ee4354ea",
      "new_mode": 33188,
      "new_path": "premake5_v2.lua"
    }
  ]
}