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.
Sorting:
- Guava postfix plugin for IntelliJ☆16May 11, 2021Updated 4 years ago
- android small programs☆16Apr 27, 2016Updated 9 years ago
- A Javascript library to convert number and monetary amount to written text in multiple languages. Also helpful for writing cheques (check…☆10Apr 29, 2025Updated 11 months ago
- pyecharts map extension - china cities - python package☆12Nov 9, 2018Updated 7 years ago
- Command line output formatting.☆24Jun 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.
- ☆12Feb 19, 2013Updated 13 years ago
- Pushable iterable☆15Feb 28, 2024Updated 2 years ago
- 免费的计算机编程类中文书籍，欢迎投稿☆10Jul 28, 2015Updated 10 years ago
- ☆12Oct 5, 2020Updated 5 years ago
- Dongyue Tech Blog☆14Jan 5, 2026Updated 3 months ago
- remove the space between English word and Chinese characters in markdown files☆11Jul 6, 2017Updated 8 years ago
- sign tieba in command line☆11Dec 6, 2022Updated 3 years ago
- Firefox extension to set the character encoding of download filenames.☆11Jul 13, 2020Updated 5 years ago
- Utility functions for the async-iterator pattern in Node.js☆16Apr 26, 2023Updated 2 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.
- Some GUI examples in Java/Scala using Reactive Extensions☆43Dec 15, 2014Updated 11 years ago
- Clone and modify a RegExp instance☆24Jul 8, 2022Updated 3 years ago
- A Firefox Extension to add CORS headers to responses.☆28Dec 4, 2012Updated 13 years ago
- Two Intellij IDEA plugins for uploading code / files to hastebin and Discord☆10Updated this week
- Out of service: consider "collections" — JavaScript iterator tools☆12Sep 3, 2011Updated 14 years ago
- No dups, no doubts☆14Jun 1, 2020Updated 5 years ago
- 💻收集整理Windows上最佳应用程序和工具列表。☆10Mar 27, 2018Updated 8 years ago
- ☆13Feb 10, 2022Updated 4 years ago
- ☆16Jan 23, 2023Updated 3 years ago
- Wordpress hosting with auto-scaling - Free Trial • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- Only highlight the screen line of the cursor in the currently active window.☆12Sep 2, 2012Updated 13 years ago
- 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
- Plugin for fish-shell to integrate fasd☆60May 24, 2021Updated 4 years ago
- call your javascript class without new because this is the classy way ;)☆10May 19, 2017Updated 8 years ago
- Anki百度风格日英发音主题☆13May 10, 2020Updated 5 years ago
- 《Python网络爬虫从入门到实践》勘误与随书源代码☆10Apr 29, 2021Updated 4 years ago
- Image Occlusion addon for Anki☆31Dec 5, 2015Updated 10 years ago
- Wordpress hosting with auto-scaling - Free Trial • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- Using nodejs to deploy a smart contract.☆13Mar 1, 2017Updated 9 years ago
- Get a compare function for array to sort☆16Dec 3, 2024Updated last year
- A `WeakMap` subclass with support for multiple keys for one entry☆17Mar 28, 2023Updated 3 years ago
- Lightweight Template engine with the same interface as Savant3 and Smarty☆23Apr 29, 2020Updated 5 years ago
- OS X and Linux compatible battery utilities☆11Feb 24, 2023Updated 3 years ago
- Highlight npm-debug.log and .npmrc for human readability☆11Jun 24, 2019Updated 6 years ago
- simple sideways submode☆11Oct 13, 2018Updated 7 years ago