A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.
☆13Aug 14, 2025Updated 7 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:
- Emacs integration for codepad.org☆42Sep 5, 2021Updated 4 years ago
- Determines whether a Node file is a Module (`import`) or a Script (`require`)☆11Oct 2, 2020Updated 5 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 10 months ago
- Grab a URL from a IPFS path by using URL.createObjectURL☆12May 1, 2025Updated 10 months ago
- 一个超轻量的Adapter实现一个尺子☆12Mar 2, 2017Updated 9 years ago
- DigitalOcean Gradient AI Platform • AdBuild production-ready AI agents using customizable tools or access multiple LLMs through a single endpoint. Create custom knowledge bases or connect external data.
- Command line output formatting.☆24Jun 10, 2020Updated 5 years ago
- Pushable iterable☆14Feb 28, 2024Updated 2 years ago
- Smaty3的扩展，前端Layout框架，用来定位和输出数据到复杂的页面模块组合中☆13Dec 5, 2013Updated 12 years ago
- The action for translating non-English issues content to English.☆12Dec 16, 2020Updated 5 years ago
- ☆12Oct 5, 2020Updated 5 years ago
- remove the space between English word and Chinese characters in markdown files☆11Jul 6, 2017Updated 8 years ago
- NodeJS/ブラウザ用 なろう(小説/小説ランキング/殿堂入り/18禁小説)API JavaScriptラッパ☆13Mar 7, 2023Updated 3 years ago
- A Node.js package wrapping the incredible exiftool (created by Phil Harvey).☆10Feb 20, 2026Updated last month
- sign tieba in command line☆11Dec 6, 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.
- Firefox extension to set the character encoding of download filenames.☆11Jul 13, 2020Updated 5 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☆10Oct 7, 2024Updated last year
- Out of service: consider "collections" — JavaScript iterator tools☆12Sep 3, 2011Updated 14 years ago
- No dups, no doubts☆14Jun 1, 2020Updated 5 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
- Only highlight the screen line of the cursor in the currently active window.☆12Sep 2, 2012Updated 13 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.
- Node.js library to generate XML from JavaScript schemas☆12Apr 1, 2017Updated 8 years ago
- Node leet speak conversion☆13Dec 9, 2024Updated last year
- call your javascript class without new because this is the classy way ;)☆10May 19, 2017Updated 8 years ago
- Plugin for fish-shell to integrate fasd☆60May 24, 2021Updated 4 years ago
- Anki百度风格日英发音主题☆13May 10, 2020Updated 5 years ago
- 毒鸡汤 - 壮士可要来一碗！☆17Dec 25, 2019Updated 6 years ago
- Line (Messenger App) Authentication Plugin for Passport☆12May 7, 2018Updated 7 years ago
- Image Occlusion addon for Anki☆31Dec 5, 2015Updated 10 years ago
- Using nodejs to deploy a smart contract.☆13Mar 1, 2017Updated 9 years ago
- 1-Click AI Models by DigitalOcean Gradient • AdDeploy popular AI models on DigitalOcean Gradient GPU virtual machines with just a single click and start building anything your business needs.
- Get a compare function for array to sort☆16Dec 3, 2024Updated last year
- A lightweight yet powerful JavaScript IDE, packaged for Portableapps.com platform☆11Jan 21, 2016Updated 10 years ago
- This is a spring and maven wrapper on top of the LMAX Disruptor framework.☆31Jun 17, 2017Updated 8 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☆12Oct 13, 2018Updated 7 years ago