A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
☆13Aug 14, 2025Updated 10 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.
Sorting:
- 根据应用包名和内容过滤器，接收、拦截并记录Android应用的通知栏消息推送。☆14Jan 16, 2019Updated 7 years ago
- Determines whether a Node file is a Module (`import`) or a Script (`require`)☆11Oct 2, 2020Updated 5 years ago
- A JavaFX based timer for timeboxed meetings.☆23Mar 3, 2017Updated 9 years ago
- OpenCV based program to track the nose and blink of eye and control the mouse pointer using the same☆15Mar 27, 2013Updated 13 years ago
- 对使用Hibernate出现的问题进行分析；Spring、MyBatis、AQS、ThreadPoolExecutor、CountDownLatch核心源码分析☆16Sep 1, 2022Updated 3 years ago
- Virtual machines for every use case on DigitalOcean • AdGet dependable uptime with 99.99% SLA, simple security tools, and predictable monthly pricing with DigitalOcean's virtual machines, called Droplets.
- Grab a URL from a IPFS path by using URL.createObjectURL☆12May 1, 2025Updated last year
- pyecharts map extension - china cities - python package☆11Nov 9, 2018Updated 7 years ago
- Command line output formatting.☆25Jun 10, 2020Updated 6 years ago
- Smaty3的扩展，前端Layout框架，用来定位和输出数据到复杂的页面模块组合中☆13Dec 5, 2013Updated 12 years ago
- ☆13Apr 24, 2023Updated 3 years ago
- ☆12Mar 21, 2015Updated 11 years ago
- remove the space between English word and Chinese characters in markdown files☆10Jul 6, 2017Updated 8 years ago
- NodeJS/ブラウザ用 なろう(小説/小説ランキング/殿堂入り/18禁小説)API JavaScriptラッパ☆13Mar 7, 2023Updated 3 years ago
- 一些无用/有用的小项目☆17Jan 5, 2026Updated 6 months ago
- Managed Kubernetes at scale on DigitalOcean • AdDigitalOcean Kubernetes includes the control plane, bandwidth allowance, container registry, automatic updates, and more for free.
- A Node.js package wrapping the incredible exiftool (created by Phil Harvey).☆10Feb 20, 2026Updated 4 months ago
- sign tieba in command line☆11Dec 6, 2022Updated 3 years ago
- 使用spring boot打造文件文档在线预览项目解决方案，支持doc、docx、ppt、pptx、xls、xlsx、zip、rar、以及众多类文本如txt、html、xml、java、properties、mp3、mp4、sql、js、md、json、conf、ini、v…☆14Dec 20, 2017Updated 8 years ago
- Firefox extension to set the character encoding of download filenames.☆12Jul 13, 2020Updated 5 years ago
- Fum is a command-line tool for fuzzy matching, recursively searching files for a literal pattern☆10Oct 7, 2019Updated 6 years ago
- Clone and modify a RegExp instance☆24Jul 8, 2022Updated 3 years ago
- Web browser simulator with jsdom☆12May 7, 2018Updated 8 years ago
- A Firefox Extension to add CORS headers to responses.☆28Dec 4, 2012Updated 13 years ago
- 基于Disruptor的异步并行框架☆20Jun 8, 2015Updated 11 years ago
- 1-Click AI Models by DigitalOcean Gradient • AdDeploy popular AI models on DigitalOcean Gradient GPU virtual machines with just a single click. Zero configuration with optimized deployments.
- Github commit count topology☆15Jan 31, 2015Updated 11 years ago
- No dups, no doubts☆14Jun 1, 2020Updated 6 years ago
- scws(Simple Chinese Word Split) node.js binding - scws中文分词node.js模块☆13Aug 6, 2018Updated 7 years ago
- 💻收集整理Windows上最佳应用程序和工具列表。☆10Mar 27, 2018Updated 8 years ago
- 👁🗨 Rare and exotic sats☆15Dec 7, 2023Updated 2 years ago
- Fatigue detection system that alerts users when they are falling asleep☆18Apr 11, 2013Updated 13 years ago
- ☆16Jan 23, 2023Updated 3 years ago
- Anki addon that loads decks from Quizlet.com☆16Jun 18, 2012Updated 14 years ago
- Only highlight the screen line of the cursor in the currently active window.☆12Sep 2, 2012Updated 13 years ago
- Managed hosting for WordPress and PHP on Cloudways • AdManaged hosting for WordPress, Magento, Laravel, or PHP apps, on multiple cloud providers. Deploy in minutes on Cloudways by DigitalOcean.
- 基函数扩展模型相关matlab代码，包含信道估计及其均衡☆15Jun 3, 2018Updated 8 years ago
- A node.js dirty word filter module supports Chinese and English☆13Dec 13, 2016Updated 9 years ago
- LMAX Disruptor backed Thrift Server implementation (half-sync/half-async).☆72Aug 16, 2017Updated 8 years ago
- A lightweight yet powerful JavaScript IDE, packaged for Portableapps.com platform☆11Jan 21, 2016Updated 10 years ago
- A `WeakMap` subclass with support for multiple keys for one entry☆18Mar 28, 2023Updated 3 years ago
- Lightweight Template engine with the same interface as Savant3 and Smarty☆23Apr 29, 2020Updated 6 years ago
- Highlight npm-debug.log and .npmrc for human readability☆11Jun 24, 2019Updated 7 years ago