liying2008/git-conflict external links

---

GitHub - View repository

GitHub.dev - Open in online code editor

Star history - Growth chart over time

deps.dev - Dependencies and security vulnerabilities

Gitingest - Export source code for LLM usage

Repomix - Export source code for LLM usage

uithub - Export source code for LLM usage

Close

liying2008/git-conflict

Readme badge preview -

If you own this repo, copy the snippet below and add it to your README.md

---

Copy

[![RelatedRepos](https://img.shields.io/badge/related-repos-yellow)](https://relatedrepos.com/gh/liying2008/git-conflict)

Close

liying2008 / git-conflictView on GitHubMore

• External links
• Readme badge

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

☆13Aug 14, 2025Updated 8 months ago

Alternatives and similar repositories for git-conflict

Users that are interested in git-conflict are comparing it to the libraries listed below. We may earn a commission when you buy through links labeled 'Ad' on this page.

• JoslynWu / Alfred-SafariBookmark

  View on GitHub
  模糊搜索或者按文件夹搜索书签，支持目录路径查看。
  ☆12Dec 22, 2017Updated 8 years ago
• xwintop / xJavaFxTool-spring

  View on GitHub
  基于JavaFx和SpringBoot搭建的实用小工具集合，方便开发过程中的代码编写与调试，想学习javaFx的同学可以参考参考。
  ☆11Nov 25, 2017Updated 8 years ago
• tumuyan / NotificationBox

  View on GitHub
  根据应用包名和内容过滤器，接收、拦截并记录Android应用的通知栏消息推送。
  ☆13Jan 16, 2019Updated 7 years ago
• Edditoria / numbo

  View on GitHub
  A Javascript library to convert number and monetary amount to written text in multiple languages. Also helpful for writing cheques (check…
  ☆10Apr 29, 2025Updated last year
• ipfs-shipyard / react-ipfs-url

  View on GitHub
  Grab a URL from a IPFS path by using URL.createObjectURL
  ☆12May 1, 2025Updated last year
• Managed Kubernetes at scale on DigitalOcean • Ad
  DigitalOcean Kubernetes includes the control plane, bandwidth allowance, container registry, automatic updates, and more for free.
• streamich / cross-ci

  View on GitHub
  Travis, CircleCI, et. al. env vars normalized
  ☆14May 18, 2023Updated 2 years ago
• seijoed / osgi-starter

  View on GitHub
  ☆12Feb 19, 2013Updated 13 years ago
• alanshaw / it-pushable

  View on GitHub
  Pushable iterable
  ☆15Feb 28, 2024Updated 2 years ago
• akira-cn / lafe

  View on GitHub
  Smaty3的扩展，前端Layout框架，用来定位和输出数据到复杂的页面模块组合中
  ☆13Dec 5, 2013Updated 12 years ago
• Issues-translate-bot / issues-translate-action

  View on GitHub
  The action for translating non-English issues content to English.
  ☆12Dec 16, 2020Updated 5 years ago
• jemaintien / free-programming-books-zh_CN

  View on GitHub
  免费的计算机编程类中文书籍，欢迎投稿
  ☆10Jul 28, 2015Updated 10 years ago
• TehShrike / is-mergeable-object

  View on GitHub
  ☆12Oct 5, 2020Updated 5 years ago
• nacos-group / nacos-activity

  View on GitHub
  The documents presented in nacos activities
  ☆11Nov 5, 2019Updated 6 years ago
• ruanyf / turpan-remove-space

  View on GitHub
  remove the space between English word and Chinese characters in markdown files
  ☆10Jul 6, 2017Updated 8 years ago
• GPUs on demand by Runpod - Special Offer Available • Ad
  Run AI, ML, and HPC workloads on powerful cloud GPUs—without limits or wasted spend. Deploy GPUs in under a minute and pay by the second.
• 59naga / naroujs

  View on GitHub
  NodeJS/ブラウザ用 なろう(小説/小説ランキング/殿堂入り/18禁小説)API JavaScriptラッパ
  ☆13Mar 7, 2023Updated 3 years ago
• nanokind / tieba-sign

  View on GitHub
  sign tieba in command line
  ☆11Dec 6, 2022Updated 3 years ago
• jingyu9575 / download-filename-encoding

  View on GitHub
  Firefox extension to set the character encoding of download filenames.
  ☆11Jul 13, 2020Updated 5 years ago
• mirkokiefer / async-iterators

  View on GitHub
  Utility functions for the async-iterator pattern in Node.js
  ☆16Apr 26, 2023Updated 3 years ago
• schnittstabil / lnk

  View on GitHub
  Create links between files cross-platform
  ☆11Nov 30, 2023Updated 2 years ago
• sindresorhus / clone-regexp

  View on GitHub
  Clone and modify a RegExp instance
  ☆24Jul 8, 2022Updated 3 years ago
• sttk / jsdom-browser

  View on GitHub
  Web browser simulator with jsdom
  ☆12May 7, 2018Updated 7 years ago
• jo5ef / Force-CORS

  View on GitHub
  A Firefox Extension to add CORS headers to responses.
  ☆28Dec 4, 2012Updated 13 years ago
• LukWebsForge / ShareIt

  View on GitHub
  Two Intellij IDEA plugins for uploading code / files to hastebin and Discord
  ☆10Apr 9, 2026Updated 3 weeks ago
• End-to-end encrypted email - Proton Mail • Ad
  Special offer: 40% Off Yearly / 80% Off First Month. All Proton services are open source and independently audited for security.
• leo27lijiang / async-framework

  View on GitHub
  基于Disruptor的异步并行框架
  ☆20Jun 8, 2015Updated 10 years ago
• kriskowal / iterator

  View on GitHub
  Out of service: consider "collections" — JavaScript iterator tools
  ☆12Sep 3, 2011Updated 14 years ago
• rmdm / nodups

  View on GitHub
  No dups, no doubts
  ☆14Jun 1, 2020Updated 5 years ago
• dotSlashLu / nodescws

  View on GitHub
  scws(Simple Chinese Word Split) node.js binding - scws中文分词node.js模块
  ☆13Aug 6, 2018Updated 7 years ago
• wh211212 / awesome-windows-cn

  View on GitHub
  💻收集整理Windows上最佳应用程序和工具列表。
  ☆10Mar 27, 2018Updated 8 years ago
• tl3shi / alfred-evernote

  View on GitHub
  ☆32Nov 17, 2016Updated 9 years ago
• natsusola / shift-arrangement-system

  View on GitHub
  ☆13Feb 10, 2022Updated 4 years ago
• neo4j-contrib / fast-http

  View on GitHub
  Fast HTTP protocol with separate netty+disruptor based server
  ☆42Apr 29, 2012Updated 14 years ago
• sodaru / yup-to-json-schema

  View on GitHub
  Convert Yup Schema to Json-Schema
  ☆13Jan 26, 2024Updated 2 years ago
• Proton VPN Special Offer - Get 70% off • Ad
  Special partner offer. Trusted by over 100 million users worldwide. Tested, Approved and Recommended by Experts.
• acrojax-open / photos2folders

  View on GitHub
  Windows application for quickly organizing photos into folders
  ☆13Apr 13, 2017Updated 9 years ago
• DiegoRBaquero / node-1337

  View on GitHub
  Node leet speak conversion
  ☆13Dec 9, 2024Updated last year
• hwdlei / code-memo

  View on GitHub
  代码备忘录, 包含mybatis、spring、spring-boot、hbase、hive、guava、jdk等示例代码
  ☆19Nov 16, 2022Updated 3 years ago
• fishgretel / fasd

  View on GitHub
  Plugin for fish-shell to integrate fasd
  ☆60May 24, 2021Updated 4 years ago
• digital-flowers / classy-decorator

  View on GitHub
  call your javascript class without new because this is the classy way ;)
  ☆10May 19, 2017Updated 8 years ago
• nitzo / passport-line

  View on GitHub
  Line (Messenger App) Authentication Plugin for Passport
  ☆12May 7, 2018Updated 7 years ago
• iisaint / deploy_contract

  View on GitHub
  Using nodejs to deploy a smart contract.
  ☆13Mar 1, 2017Updated 9 years ago