A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
☆13Aug 14, 2025Updated 9 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:
- 基于JavaFx和SpringBoot搭建的实用小工具集合，方便开发过程中的代码编写与调试，想学习javaFx的同学可以参考参考。☆11Nov 25, 2017Updated 8 years ago
- 😎👍 A list of efficiency software for Windows☆13Jun 18, 2019Updated 6 years ago
- Determines whether a Node file is a Module (`import`) or a Script (`require`)☆11Oct 2, 2020Updated 5 years ago
- Travis, CircleCI, et. al. env vars normalized☆14May 18, 2023Updated 3 years ago
- Command line output formatting.☆25Jun 10, 2020Updated 5 years ago
- GPU virtual machines on DigitalOcean Gradient AI • AdGet to production fast with high-performance AMD and NVIDIA GPUs you can spin up in seconds. The definition of operational simplicity.
- Smaty3的扩展，前端Layout框架，用来定位和输出数据到复杂的页面模块组合中☆13Dec 5, 2013Updated 12 years ago
- The action for translating non-English issues content to English.☆12Dec 16, 2020Updated 5 years ago
- The documents presented in nacos activities☆11Nov 5, 2019Updated 6 years ago
- NodeJS/ブラウザ用 なろう(小説/小説ランキング/殿堂入り/18禁小説)API JavaScriptラッパ☆13Mar 7, 2023Updated 3 years ago
- sign tieba in command line☆11Dec 6, 2022Updated 3 years ago
- Firefox extension to set the character encoding of download filenames.☆12Jul 13, 2020Updated 5 years ago
- Utility functions for the async-iterator pattern in Node.js☆16Apr 26, 2023Updated 3 years ago
- Create links between files cross-platform☆11Nov 30, 2023Updated 2 years ago
- Fum is a command-line tool for fuzzy matching, recursively searching files for a literal pattern☆10Oct 7, 2019Updated 6 years ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- 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 10 years ago
- No dups, no doubts☆14Jun 1, 2020Updated 5 years ago
- ☆32Nov 17, 2016Updated 9 years ago
- ☆13Feb 10, 2022Updated 4 years ago
- Anki addon that loads decks from Quizlet.com☆16Jun 18, 2012Updated 13 years ago
- Convert Yup Schema to Json-Schema☆13Jan 26, 2024Updated 2 years ago
- End-to-end encrypted cloud storage - Proton Drive • AdSpecial offer: 40% Off Yearly / 80% Off First Month. Protect your most important files, photos, and documents from prying eyes.
- Windows application for quickly organizing photos into folders☆13Apr 13, 2017Updated 9 years ago
- Node.js library to generate XML from JavaScript schemas☆12Apr 1, 2017Updated 9 years ago
- Node leet speak conversion☆13Dec 9, 2024Updated last year
- 代码备忘录, 包含mybatis、spring、spring-boot、hbase、hive、guava、jdk等示例代码☆19Nov 16, 2022Updated 3 years ago
- Plugin for fish-shell to integrate fasd☆60May 24, 2021Updated 5 years ago
- call your javascript class without new because this is the classy way ;)☆10May 19, 2017Updated 9 years ago
- 毒鸡汤 - 壮士可要来一碗！☆17Dec 25, 2019Updated 6 years ago
- Using nodejs to deploy a smart contract.☆13Mar 1, 2017Updated 9 years ago
- A node.js dirty word filter module supports Chinese and English☆13Dec 13, 2016Updated 9 years ago
- Wordpress hosting with auto-scaling - Free Trial Offer • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- This is a spring and maven wrapper on top of the LMAX Disruptor framework.☆31Jun 17, 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☆17Mar 28, 2023Updated 3 years ago
- Anki百度风格日英发音主题☆14May 10, 2020Updated 6 years ago
- Expand characters to code if not in a comment or string☆13Jul 7, 2016Updated 9 years ago
- Stable diffusion WebUI extension. Renders generation information on the output image.☆16Nov 4, 2024Updated last year
- Node.js library to parse/generate OPDS feed☆22Jul 26, 2015Updated 10 years ago