https://github.com/liying2008/git-conflict

A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
https://github.com/liying2008/git-conflict

androidstudio androidstudio-plugin git git-conflict ide-plugin idea idea-plugin jetbrains jetbrains-plugin plugin

Last synced: 3 months ago
JSON representation

A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.

• Host: GitHub
• URL: https://github.com/liying2008/git-conflict
• Owner: liying2008
• License: apache-2.0
• Created: 2018-04-20T15:06:43.000Z (almost 7 years ago)
• Default Branch: master
• Last Pushed: 2024-11-05T00:57:04.000Z (4 months ago)
• Last Synced: 2024-11-05T01:30:35.565Z (4 months ago)
• Topics: androidstudio, androidstudio-plugin, git, git-conflict, ide-plugin, idea, idea-plugin, jetbrains, jetbrains-plugin, plugin
• Language: Kotlin
• Homepage: http://plugins.jetbrains.com/plugin/10656-git-conflict
• Size: 533 KB
• Stars: 12
• Watchers: 4
• Forks: 1
• Open Issues: 1
• Metadata Files:
  • Readme: README.md
  • Changelog: changeNotes.html
  • License: LICENSE

Awesome Lists containing this project

README

        
# git-conflict

[![JetBrains Plugins](https://img.shields.io/jetbrains/plugin/v/10656-git-conflict.svg)](https://plugins.jetbrains.com/plugin/10656-git-conflict)

[![JetBrains plugins](https://img.shields.io/jetbrains/plugin/d/10656-git-conflict.svg)](https://plugins.jetbrains.com/plugin/10656-git-conflict)

[![GitHub release](https://img.shields.io/github/release/liying2008/git-conflict.svg)](https://github.com/liying2008/git-conflict/releases)

[![license](https://img.shields.io/github/license/liying2008/git-conflict.svg)](https://github.com/liying2008/git-conflict/blob/master/LICENSE)

一款 JetBrains IDEA / Android Studio 等 Jetbrains IDE 的 `Git` 冲突 **高亮显示** 的插件。

## How to Install

- 在 [GitHub Releases](https://github.com/liying2008/git-conflict/releases) 页面下载最新的 `zip` 包，然后通过 `Settings -> Plugins -> Install plugin from disk..` 选择下载的 `zip` 包安装；

- 或者在 `Settings -> Plugins -> Marketplace` 里面搜索 `Git Conflict` 。

## How to Use

**高亮显示冲突：** 打开包含冲突的文件，然后在编辑区域右键选择 `Highlight Git Conflict` （快捷键 `shift ctrl G`），就可以看到冲突部分被高亮显示了：

![highlight-git-conflict](example/highlight-git-conflict.png)

**取消高亮显示冲突：** 在编辑区域再次右键，选择 `Cancel Highlight Git Conflict` （快捷键 `shift ctrl alt G`）即可。

**快速解决冲突：** 在高亮状态下，在编辑区域右键，可看到 `Fix Git Conflict` 菜单组里提供了三种解决冲突的预置方案：

- *Accept Current Change:*  采用当前更改

- *Accept Incoming Change:*  采用传入的更改

- *Accept Both Changes:*  保留双方更改

**Screenshot:**

![fix-git-conflict](example/fix-git-conflict.gif)

**设置面板：** 通过 `Settings -> Tools -> Git Conflict` 进入设置面板，选择自己喜欢的颜色方案：

![settings-panel](example/settings-panel.png)

## Contact Me

Email：[[email protected]](mailto:[email protected])