{"id":18862695,"url":"https://github.com/zk-phi/commentize-conflict","last_synced_at":"2025-06-17T08:33:41.807Z","repository":{"id":152679715,"uuid":"78345347","full_name":"zk-phi/commentize-conflict","owner":"zk-phi","description":"Minor mode to treat git conflict markers and their changes as comment","archived":false,"fork":false,"pushed_at":"2021-02-28T17:40:44.000Z","size":21,"stargazers_count":1,"open_issues_count":1,"forks_count":0,"subscribers_count":3,"default_branch":"master","last_synced_at":"2024-12-30T21:16:11.734Z","etag":null,"topics":["emacs"],"latest_commit_sha":null,"homepage":"","language":"Emacs Lisp","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":null,"status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/zk-phi.png","metadata":{"files":{"readme":"Readme.org","changelog":null,"contributing":null,"funding":null,"license":null,"code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null}},"created_at":"2017-01-08T13:45:29.000Z","updated_at":"2021-02-28T17:40:46.000Z","dependencies_parsed_at":null,"dependency_job_id":"d7315cac-2f52-4f41-87f4-f6fbd931b3c2","html_url":"https://github.com/zk-phi/commentize-conflict","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zk-phi%2Fcommentize-conflict","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zk-phi%2Fcommentize-conflict/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zk-phi%2Fcommentize-conflict/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/zk-phi%2Fcommentize-conflict/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/zk-phi","download_url":"https://codeload.github.com/zk-phi/commentize-conflict/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":239808141,"owners_count":19700440,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["emacs"],"created_at":"2024-11-08T04:35:31.235Z","updated_at":"2025-02-20T08:43:00.281Z","avatar_url":"https://github.com/zk-phi.png","language":"Emacs Lisp","readme":"* commentize-conflict.el\n\nPrevent conflict markers from breaking syntactic analysis\n\nコンフリクトでシンタックスハイライトなどが壊れないようにするマイナーモー\nド\n\n** Description\n\nThis package provides a minor-mode which advices major modes to treat\ngit conflict markers and \"their\" changes as comments, so that they\nwill not break major-mode's syntax-highlighting.\n\n** Screenshots\n\n- without =commentize-conflict=\n\n  [[./img/without.png]]\n\n  =show-paren-mode= is broken by the conflict marker.\n\n- with =commentize-conflict=\n\n  [[./img/with.png]]\n\n  lines between ~=~ and ~\u003c\u003c\u003c\u003c\u003c\u003c\u003c feature-branch~ are treated as\n  comments and =show-paren-mode= is NOT broken.\n\n** Installation\n\nPut this scrpit into a 'load-path'ed directory, and load it in your\ninit file.\n\n: (require 'commentize-conflict)\n\nand add hook to the modes you want to enable the feature.\n\n: (add-hook 'prog-mode-hook 'commentize-conflict-mode)\n","funding_links":[],"categories":[],"sub_categories":[],"project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fzk-phi%2Fcommentize-conflict","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fzk-phi%2Fcommentize-conflict","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fzk-phi%2Fcommentize-conflict/lists"}