{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":563543377,"defaultBranch":"main","name":"merge","ownerLogin":"codemirror","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2022-11-08T20:43:37.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/8876537?v=4","public":true,"private":false,"isOrgOwned":true},"refInfo":{"name":"","listCacheKey":"v0:1723981658.0","currentOid":""},"activityList":{"items":[{"before":"8b7a90f6270827ac1202783f192c40a2955bf4b1","after":"5f3e8b50d69f65441b36dd3d8edb316586d834e6","ref":"refs/heads/main","pushedAt":"2024-09-10T08:21:42.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Make presentable diffs align changes to line boundaries more generally\n\nFIX: Improve the way `presentableDiff` aligns changes to line boundaries when possible.\n\nIssue https://github.com/codemirror/codemirror5/issues/7106","shortMessageHtmlLink":"Make presentable diffs align changes to line boundaries more generally"}},{"before":"68a9e8b40117f9fb5d592e448d6b77a1bca54952","after":"8b7a90f6270827ac1202783f192c40a2955bf4b1","ref":"refs/heads/main","pushedAt":"2024-08-18T11:47:36.000Z","pushType":"push","commitsCount":2,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.7.0","shortMessageHtmlLink":"Mark version 6.7.0"}},{"before":"14981b0d46e91ae164c8cd975f0b4069fe547c88","after":"68a9e8b40117f9fb5d592e448d6b77a1bca54952","ref":"refs/heads/main","pushedAt":"2024-07-31T06:19:49.000Z","pushType":"push","commitsCount":2,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.6.7","shortMessageHtmlLink":"Mark version 6.6.7"}},{"before":"31f3258b7888ded8306f704d35fbcf1144f019d2","after":"14981b0d46e91ae164c8cd975f0b4069fe547c88","ref":"refs/heads/main","pushedAt":"2024-07-30T20:44:44.000Z","pushType":"push","commitsCount":3,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.6.6","shortMessageHtmlLink":"Mark version 6.6.6"}},{"before":"f36a04d4ac92e0a8a3666ecf5c7d00c33afe6c0a","after":"31f3258b7888ded8306f704d35fbcf1144f019d2","ref":"refs/heads/main","pushedAt":"2024-07-18T18:36:33.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.6.5","shortMessageHtmlLink":"Mark version 6.6.5"}},{"before":"4c9fc58e26ab35260928b43a223e3efdaef012d8","after":"f36a04d4ac92e0a8a3666ecf5c7d00c33afe6c0a","ref":"refs/heads/main","pushedAt":"2024-07-18T15:35:00.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Fix a bug that corrupted the deleted text for some chunks in unified merge view\n\nFIX: Fix an issue that would corrupt the text displayed for some deleted lines\nin the unified merge view.\n\nCloses https://github.com/codemirror/dev/issues/1410","shortMessageHtmlLink":"Fix a bug that corrupted the deleted text for some chunks in unified …"}},{"before":"926f7f7b9b46248f0821a689ced22d19f08a5cbb","after":"4c9fc58e26ab35260928b43a223e3efdaef012d8","ref":"refs/heads/main","pushedAt":"2024-07-18T13:42:49.000Z","pushType":"push","commitsCount":2,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.6.4","shortMessageHtmlLink":"Mark version 6.6.4"}},{"before":"ff2ddac0265e3cd37464d53f947e0d7e8f3ee992","after":"926f7f7b9b46248f0821a689ced22d19f08a5cbb","ref":"refs/heads/main","pushedAt":"2024-06-07T09:14:51.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.6.3","shortMessageHtmlLink":"Mark version 6.6.3"}},{"before":"4cd73ec6e704acd5a3408f2bef8c0693a86ae255","after":"ff2ddac0265e3cd37464d53f947e0d7e8f3ee992","ref":"refs/heads/main","pushedAt":"2024-06-07T09:14:29.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Use getOriginalDoc in originalDocChangeEffect\n\nThis was causing a length mismatch error because the ChangeSet should be for the original\r\n\r\nFIX: Fix `originalDocChangeEffect` to apply the changes to the appropriate document.","shortMessageHtmlLink":"Use getOriginalDoc in originalDocChangeEffect"}},{"before":"7bd4d178a8f7e16ca17521cae51d9744fa0ac7ff","after":"4cd73ec6e704acd5a3408f2bef8c0693a86ae255","ref":"refs/heads/main","pushedAt":"2024-05-17T06:03:12.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.6.2","shortMessageHtmlLink":"Mark version 6.6.2"}},{"before":"717b66f2d1f12cee5f174f0f9eef228b35f38a4b","after":"7bd4d178a8f7e16ca17521cae51d9744fa0ac7ff","ref":"refs/heads/main","pushedAt":"2024-05-17T06:03:04.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Restore default scanLimit when diffing for chunks\n\nFIX: Restore the default scan limit when diffing for chunks, which looks like\nit was accidentally dropped when it was made configurable in 6.3.0.\n\nCloses https://github.com/codemirror/dev/issues/1382","shortMessageHtmlLink":"Restore default scanLimit when diffing for chunks"}},{"before":"45a8e8ccd5b91467c7afaad91446dc78da2f0955","after":"717b66f2d1f12cee5f174f0f9eef228b35f38a4b","ref":"refs/heads/main","pushedAt":"2024-03-08T15:54:09.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.6.1","shortMessageHtmlLink":"Mark version 6.6.1"}},{"before":"844b80c9f6f38e81793c6bbbb5ebe4ea873fbcb7","after":"45a8e8ccd5b91467c7afaad91446dc78da2f0955","ref":"refs/heads/main","pushedAt":"2024-03-08T15:53:55.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Fix another bug in chunk updates\n\nFIX: Fix a bug that could cause the set of changed chunks to be\nupdated incorrectly on some types of changes.\n\nCloses https://github.com/codemirror/dev/issues/1352","shortMessageHtmlLink":"Fix another bug in chunk updates"}},{"before":"378cd3cf3311dfe17cae1cc3821224884265a9f3","after":"844b80c9f6f38e81793c6bbbb5ebe4ea873fbcb7","ref":"refs/heads/main","pushedAt":"2024-02-12T07:21:02.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"README: Add link to an example\n\nI had some trouble finding an example; I think\na link will help.","shortMessageHtmlLink":"README: Add link to an example"}},{"before":"8121e74eaaabef06e9c1c96fa8486d97a17d5fa3","after":"378cd3cf3311dfe17cae1cc3821224884265a9f3","ref":"refs/heads/main","pushedAt":"2024-01-25T10:24:12.000Z","pushType":"push","commitsCount":2,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.6.0","shortMessageHtmlLink":"Mark version 6.6.0"}},{"before":"7892fa6f538a29c440f9a5a6472c4019cdc2103f","after":"8121e74eaaabef06e9c1c96fa8486d97a17d5fa3","ref":"refs/heads/main","pushedAt":"2024-01-05T11:05:01.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Directly export updateOriginalDoc\n\nFEATURE: The state effect used to change the original document in a unified merge view is\nnow available to client code as `updateOriginalDoc`.\n\nSee https://discuss.codemirror.net/t/using-merge-w-collab/7648","shortMessageHtmlLink":"Directly export updateOriginalDoc"}},{"before":"7d168f61f87bdc4f23f1b1bf6273a3a897e312ac","after":"7892fa6f538a29c440f9a5a6472c4019cdc2103f","ref":"refs/heads/main","pushedAt":"2024-01-04T10:53:05.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.5.0","shortMessageHtmlLink":"Mark version 6.5.0"}},{"before":"7c0d8bfc8f8f1ab91ae6bf0022ffc136bb2252af","after":"7d168f61f87bdc4f23f1b1bf6273a3a897e312ac","ref":"refs/heads/main","pushedAt":"2023-12-19T21:57:24.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Add style-mod as a direct dependency\n\nCloses https://github.com/codemirror/dev/issues/1311","shortMessageHtmlLink":"Add style-mod as a direct dependency"}},{"before":"39d19aeb3ae74b3888816e32013b13153be943f2","after":"7c0d8bfc8f8f1ab91ae6bf0022ffc136bb2252af","ref":"refs/heads/main","pushedAt":"2023-12-15T13:22:34.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Export changeOriginalDocEffect helper\n\nFEATURE: The new `changeOriginalDocEffect` function can be used to update the\nreference document in a unified merge editor.\n\nIssue https://github.com/codemirror/merge/pull/3","shortMessageHtmlLink":"Export changeOriginalDocEffect helper"}},{"before":"e29b7cfcab99c5a98727e63e1e6f7c0ab06c9ad3","after":"39d19aeb3ae74b3888816e32013b13153be943f2","ref":"refs/heads/main","pushedAt":"2023-12-14T17:11:41.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.4.0","shortMessageHtmlLink":"Mark version 6.4.0"}},{"before":"df72a3a82e4bfafa0005825a21c9c789c7ebf57a","after":"e29b7cfcab99c5a98727e63e1e6f7c0ab06c9ad3","ref":"refs/heads/main","pushedAt":"2023-12-14T17:11:31.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Export getOriginalDoc function\n\nFEATURE: The `getOriginalDoc` function extracts the original document\nfrom a unified merge editor.\n\nIssue https://github.com/codemirror/merge/pull/3","shortMessageHtmlLink":"Export getOriginalDoc function"}},{"before":"3d54249e068166695dee0fca43d0770830c42033","after":"df72a3a82e4bfafa0005825a21c9c789c7ebf57a","ref":"refs/heads/main","pushedAt":"2023-12-03T13:22:36.000Z","pushType":"push","commitsCount":2,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.3.1","shortMessageHtmlLink":"Mark version 6.3.1"}},{"before":"64ba3bb6d5afa15018ef7c4c4754d35d7686fd39","after":"3d54249e068166695dee0fca43d0770830c42033","ref":"refs/heads/main","pushedAt":"2023-11-26T09:53:01.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Give accept action in unified diff view a userEvent tag\n\nFIX: Add a `userEvent` annotation to transactions that accept a change in the unified\r\nmerge view.","shortMessageHtmlLink":"Give accept action in unified diff view a userEvent tag"}},{"before":"6df47120bde5b84b1847e60afd753dca01956e8c","after":"64ba3bb6d5afa15018ef7c4c4754d35d7686fd39","ref":"refs/heads/main","pushedAt":"2023-11-16T06:45:23.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.3.0","shortMessageHtmlLink":"Mark version 6.3.0"}},{"before":"33e1998c59b5aec569656f071f73038098cf8f1c","after":"6df47120bde5b84b1847e60afd753dca01956e8c","ref":"refs/heads/main","pushedAt":"2023-11-15T11:09:53.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Make readme more complete","shortMessageHtmlLink":"Make readme more complete"}},{"before":"d4c0024ebfb0ea7883fe0070e538f31ec37e2056","after":"33e1998c59b5aec569656f071f73038098cf8f1c","ref":"refs/heads/main","pushedAt":"2023-11-15T11:05:55.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Allow scanLimit to be configured in merge views\n\nFEATURE: Merge views (and `Chunk` building methods) now take an optional diff\nconfig object to allow precision to be configured.\n\nSee https://discuss.codemirror.net/t/incorrect-diff-for-large-files-in-merge-view/7411","shortMessageHtmlLink":"Allow scanLimit to be configured in merge views"}},{"before":"bb4fa9a298e82f728c4aed542262e4ae84a036ee","after":"d4c0024ebfb0ea7883fe0070e538f31ec37e2056","ref":"refs/heads/main","pushedAt":"2023-10-06T11:16:42.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.2.0","shortMessageHtmlLink":"Mark version 6.2.0"}},{"before":"bb9a2ece768b4771a565891b35fdee909a7a99c7","after":"bb4fa9a298e82f728c4aed542262e4ae84a036ee","ref":"refs/heads/main","pushedAt":"2023-10-06T11:16:28.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Export nextChunk and previousChunk commands\n\nFEATURE: The package now exports `goToNextChunk` and\n`goToPreviousChunk` commands that allow by-changed-chunk document\nnavigation.","shortMessageHtmlLink":"Export nextChunk and previousChunk commands"}},{"before":"8429d56b9bad8a810d98cfda891b20734e384ebd","after":"bb9a2ece768b4771a565891b35fdee909a7a99c7","ref":"refs/heads/main","pushedAt":"2023-09-28T11:13:44.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Mark version 6.1.3","shortMessageHtmlLink":"Mark version 6.1.3"}},{"before":"b57eee1bdf1f999a558d2162baed8c53b542bc31","after":"8429d56b9bad8a810d98cfda891b20734e384ebd","ref":"refs/heads/main","pushedAt":"2023-09-28T08:27:11.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"marijnh","name":"Marijn Haverbeke","path":"/marijnh","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/144427?s=80&v=4"},"commit":{"message":"Generate spacers for the whole document\n\nFIX: Create alignment spacers for the whole document, not just the viewport, to avoid\nscroll position popping and misalignment.\n\nSee https://discuss.codemirror.net/t/editor-lines-out-of-sync-in-merge-view/7138","shortMessageHtmlLink":"Generate spacers for the whole document"}}],"hasNextPage":true,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"djE6ks8AAAAEsceauAA","startCursor":null,"endCursor":null}},"title":"Activity · codemirror/merge"}