{"id":21832745,"url":"https://github.com/liying2008/git-conflict","last_synced_at":"2025-04-14T07:37:26.724Z","repository":{"id":72797271,"uuid":"130377999","full_name":"liying2008/git-conflict","owner":"liying2008","description":"A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts. ","archived":false,"fork":false,"pushed_at":"2025-01-22T15:17:24.000Z","size":583,"stargazers_count":12,"open_issues_count":1,"forks_count":1,"subscribers_count":3,"default_branch":"master","last_synced_at":"2025-03-27T21:11:48.784Z","etag":null,"topics":["androidstudio","androidstudio-plugin","git","git-conflict","ide-plugin","idea","idea-plugin","jetbrains","jetbrains-plugin","plugin"],"latest_commit_sha":null,"homepage":"http://plugins.jetbrains.com/plugin/10656-git-conflict","language":"Kotlin","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"apache-2.0","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/liying2008.png","metadata":{"files":{"readme":"README.md","changelog":"changeNotes.html","contributing":null,"funding":null,"license":"LICENSE","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":"2018-04-20T15:06:43.000Z","updated_at":"2025-01-22T15:17:27.000Z","dependencies_parsed_at":"2025-01-05T23:30:34.704Z","dependency_job_id":null,"html_url":"https://github.com/liying2008/git-conflict","commit_stats":null,"previous_names":[],"tags_count":10,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/liying2008%2Fgit-conflict","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/liying2008%2Fgit-conflict/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/liying2008%2Fgit-conflict/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/liying2008%2Fgit-conflict/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/liying2008","download_url":"https://codeload.github.com/liying2008/git-conflict/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":248840496,"owners_count":21169997,"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":["androidstudio","androidstudio-plugin","git","git-conflict","ide-plugin","idea","idea-plugin","jetbrains","jetbrains-plugin","plugin"],"created_at":"2024-11-27T19:25:17.030Z","updated_at":"2025-04-14T07:37:26.672Z","avatar_url":"https://github.com/liying2008.png","language":"Kotlin","funding_links":[],"categories":[],"sub_categories":[],"readme":"# git-conflict\n\n\n[![JetBrains Plugins](https://img.shields.io/jetbrains/plugin/v/10656-git-conflict.svg)](https://plugins.jetbrains.com/plugin/10656-git-conflict)\n[![JetBrains plugins](https://img.shields.io/jetbrains/plugin/d/10656-git-conflict.svg)](https://plugins.jetbrains.com/plugin/10656-git-conflict)\n[![GitHub release](https://img.shields.io/github/release/liying2008/git-conflict.svg)](https://github.com/liying2008/git-conflict/releases)\n[![license](https://img.shields.io/github/license/liying2008/git-conflict.svg)](https://github.com/liying2008/git-conflict/blob/master/LICENSE)\n\n一款 JetBrains IDEA / Android Studio 等 Jetbrains IDE 的 `Git` 冲突 **高亮显示** 的插件。\n\n## How to Install\n\n- 在 [GitHub Releases](https://github.com/liying2008/git-conflict/releases) 页面下载最新的 `zip` 包，然后通过 `Settings -\u003e Plugins -\u003e Install plugin from disk..` 选择下载的 `zip` 包安装；\n\n- 或者在 `Settings -\u003e Plugins -\u003e Marketplace` 里面搜索 `Git Conflict` 。\n\n## How to Use\n\n**高亮显示冲突：** 打开包含冲突的文件，然后在编辑区域右键选择 `Highlight Git Conflict` （快捷键 `shift ctrl G`），就可以看到冲突部分被高亮显示了：\n\n![highlight-git-conflict](example/highlight-git-conflict.png)\n\n**取消高亮显示冲突：** 在编辑区域再次右键，选择 `Cancel Highlight Git Conflict` （快捷键 `shift ctrl alt G`）即可。\n\n**快速解决冲突：** 在高亮状态下，在编辑区域右键，可看到 `Fix Git Conflict` 菜单组里提供了三种解决冲突的预置方案：\n- *Accept Current Change:*  采用当前更改\n- *Accept Incoming Change:*  采用传入的更改\n- *Accept Both Changes:*  保留双方更改\n\n**Screenshot:**\n\n![fix-git-conflict](example/fix-git-conflict.gif)\n\n**设置面板：** 通过 `Settings -\u003e Tools -\u003e Git Conflict` 进入设置面板，选择自己喜欢的颜色方案：\n\n![settings-panel](example/settings-panel.png)\n\n## Contact Me\n\nEmail：[liruoer2008@yeah.net](mailto:liruoer2008@yeah.net)  \n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fliying2008%2Fgit-conflict","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fliying2008%2Fgit-conflict","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fliying2008%2Fgit-conflict/lists"}