{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":130377999,"defaultBranch":"master","name":"git-conflict","ownerLogin":"liying2008","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2018-04-20T15:06:43.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/11592598?v=4","public":true,"private":false,"isOrgOwned":false},"refInfo":{"name":"","listCacheKey":"v0:1701696012.0","currentOid":""},"activityList":{"items":[{"before":"88719feb82e47346a394b2e5266096225602929a","after":"2f9f1d83436ca91dc773241aa937113cd9ca8dca","ref":"refs/heads/master","pushedAt":"2023-12-04T13:26:33.000Z","pushType":"pr_merge","commitsCount":6,"pusher":{"login":"liying2008","name":"独毒火","path":"/liying2008","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11592598?s=80&v=4"},"commit":{"message":"Merge pull request #11 from liying2008/dev\n\nmerge v2.0.0","shortMessageHtmlLink":"Merge pull request <a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2023857754\" data-permission-text=\"Title is private\" data-url=\"https://github.com/liying2008/git-conflict/issues/11\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/liying2008/git-conflict/pull/11/hovercard\" href=\"https://github.com/liying2008/git-conflict/pull/11\">#11</a> from liying2008/dev"}},{"before":"4078eeef1cb80fe695722dd32b53099b7aaa8236","after":"00e043e6f2b838f68c4b1df2df509bf54a03da5b","ref":"refs/heads/dev","pushedAt":"2023-12-02T16:34:20.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"liying2008","name":"独毒火","path":"/liying2008","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11592598?s=80&v=4"},"commit":{"message":"chore: use ColorChooserService","shortMessageHtmlLink":"chore: use ColorChooserService"}},{"before":"b07c671621ea6f3d1d37744d2d5852ec36e53157","after":"4078eeef1cb80fe695722dd32b53099b7aaa8236","ref":"refs/heads/dev","pushedAt":"2023-12-02T16:06:53.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"liying2008","name":"独毒火","path":"/liying2008","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11592598?s=80&v=4"},"commit":{"message":"docs: update changeNotes.html","shortMessageHtmlLink":"docs: update changeNotes.html"}},{"before":"923c215f49af1ff6d4ec5f1c1316dfcf2097cbd6","after":"b07c671621ea6f3d1d37744d2d5852ec36e53157","ref":"refs/heads/dev","pushedAt":"2023-12-02T15:39:00.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"liying2008","name":"独毒火","path":"/liying2008","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11592598?s=80&v=4"},"commit":{"message":"fix: fix an extra blank line in individual cases when resolving conflicts","shortMessageHtmlLink":"fix: fix an extra blank line in individual cases when resolving confl…"}},{"before":"43c00a90a9a49c4537950c27d2a3488d694387ca","after":"923c215f49af1ff6d4ec5f1c1316dfcf2097cbd6","ref":"refs/heads/dev","pushedAt":"2023-12-02T09:03:36.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"liying2008","name":"独毒火","path":"/liying2008","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11592598?s=80&v=4"},"commit":{"message":"chore: optimize formatHexA and color chooser","shortMessageHtmlLink":"chore: optimize formatHexA and color chooser"}},{"before":"0b6b6dc17cae98530501920add08185f1b4a2dab","after":"43c00a90a9a49c4537950c27d2a3488d694387ca","ref":"refs/heads/dev","pushedAt":"2023-12-02T06:58:13.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"liying2008","name":"独毒火","path":"/liying2008","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11592598?s=80&v=4"},"commit":{"message":"feat: support diff3 conflict style","shortMessageHtmlLink":"feat: support diff3 conflict style"}},{"before":"aeeeb38e1c5f2b1daaf3cdf300d57e556e2f2bb1","after":"88719feb82e47346a394b2e5266096225602929a","ref":"refs/heads/master","pushedAt":"2023-08-01T13:30:49.000Z","pushType":"pr_merge","commitsCount":2,"pusher":{"login":"liying2008","name":"独毒火","path":"/liying2008","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11592598?s=80&v=4"},"commit":{"message":"Merge pull request #9 from liying2008/dev\n\nfix: fix some compatibility errors","shortMessageHtmlLink":"Merge pull request <a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"1831296884\" data-permission-text=\"Title is private\" data-url=\"https://github.com/liying2008/git-conflict/issues/9\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/liying2008/git-conflict/pull/9/hovercard\" href=\"https://github.com/liying2008/git-conflict/pull/9\">#9</a> from liying2008/dev"}},{"before":"8dfc49ae68811cc8f92f96c80872127b3c09b94e","after":"0b6b6dc17cae98530501920add08185f1b4a2dab","ref":"refs/heads/dev","pushedAt":"2023-07-29T15:17:21.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"liying2008","name":"独毒火","path":"/liying2008","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11592598?s=80&v=4"},"commit":{"message":"fix: fix some compatibility errors\n\nUpgrade Gradle version to 8.1.1\nUpgrade Kotlin version to 1.8.22\nUpgrade Java version to 17\nMigrate build.gradle to build.gradle.kts","shortMessageHtmlLink":"fix: fix some compatibility errors"}}],"hasNextPage":false,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"Y3Vyc29yOnYyOpK7MjAyMy0xMi0wNFQxMzoyNjozMy4wMDAwMDBazwAAAAPAebar","startCursor":"Y3Vyc29yOnYyOpK7MjAyMy0xMi0wNFQxMzoyNjozMy4wMDAwMDBazwAAAAPAebar","endCursor":"Y3Vyc29yOnYyOpK7MjAyMy0wNy0yOVQxNToxNzoyMS4wMDAwMDBazwAAAANfxfut"}},"title":"Activity · liying2008/git-conflict"}