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:
- 模糊搜索或者按文件夹搜索书签，支持目录路径查看。☆12Dec 22, 2017Updated 8 years ago
- Productivity updates for recent Visual Studio versions☆11Dec 8, 2022Updated 3 years ago
- This IntelliJ IDEA plugin runs the native "Convert Java File To Kotlin File" action and preserves files VCS history by committing the ren…☆14Nov 5, 2021Updated 4 years ago
- ☆13Jul 31, 2024Updated last year
- Codecademy Projects☆14Apr 24, 2020Updated 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.
- A command line tool to run Android Method Trace with ddmlib☆10Oct 9, 2017Updated 8 years ago
- 基于JavaFx和SpringBoot搭建的实用小工具集合，方便开发过程中的代码编写与调试，想学习javaFx的同学可以参考参考。☆11Nov 25, 2017Updated 8 years ago
- Custom Camera & Custom Gallery for Android. Really good for developer to attach the library into application.☆11Sep 17, 2021Updated 4 years ago
- Git command reference Docset for Dash☆14May 14, 2019Updated 7 years ago
- Building a desktop Paint App clone with C++ and wxWidgets☆14Mar 25, 2026Updated 2 months ago
- An ESM package that uses Web Streams API to create v1, v2 or hybrid torrents in your web browser☆10Aug 5, 2025Updated 10 months ago
- common programming software themes and some axure package☆14Apr 10, 2022Updated 4 years ago
- ☆11Aug 6, 2025Updated 10 months ago
- Emacs integration for codepad.org☆42Sep 5, 2021Updated 4 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.
- <tangy-form> is a web component for creating multipage forms. Other <tangy-*> input elements are included as well.☆16Mar 30, 2026Updated 2 months ago
- ☆17Jan 13, 2018Updated 8 years ago
- (r)ust macros for h(tml) expansion => rtml☆15Jun 22, 2023Updated 2 years ago
- Slides, notes, and code for KotlinConf talk on Data Science☆19Mar 5, 2018Updated 8 years ago
- 😎👍 A list of efficiency software for Windows☆14Jun 18, 2019Updated 6 years ago
- Powerful history manager for Chromium☆17Aug 13, 2025Updated 10 months ago
- 根据应用包名和内容过滤器，接收、拦截并记录Android应用的通知栏消息推送。☆13Jan 16, 2019Updated 7 years ago
- Guava postfix plugin for IntelliJ☆16May 11, 2021Updated 5 years ago
- A HackerNews clone built with Next.js and shadcn/ui.☆25May 26, 2026Updated 2 weeks ago
- Managed Database hosting by DigitalOcean • AdPostgreSQL, MySQL, MongoDB, Kafka, Valkey, and OpenSearch available. Automatically scale up storage and focus on building your apps.
- Stockholms Lokaltrafik - Command Line Interface☆16Apr 27, 2019Updated 7 years ago
- Determines whether a Node file is a Module (`import`) or a Script (`require`)☆11Oct 2, 2020Updated 5 years ago
- Kotlin native with SFML example☆18Aug 5, 2022Updated 3 years ago
- A JavaFX based timer for timeboxed meetings.☆23Mar 3, 2017Updated 9 years ago
- android small programs☆16Apr 27, 2016Updated 10 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
- 带你认识flutter widgets的使用。根据flutter中文网的“widget目录”进行编写☆18Aug 18, 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 last year
- Kotlin Hybrid Desktop Demo☆23Jun 1, 2020Updated 6 years ago
- Managed Kubernetes at scale on DigitalOcean • AdDigitalOcean Kubernetes includes the control plane, bandwidth allowance, container registry, automatic updates, and more for free.
- 对使用Hibernate出现的问题进行分析；Spring、MyBatis、AQS、ThreadPoolExecutor、CountDownLatch核心源码分析☆16Sep 1, 2022Updated 3 years ago
- Simple sample wxWidgets CMake project for all platforms, especially using Vcpkg and Visual Studio on Windows☆19Feb 16, 2023Updated 3 years ago
- Grab a URL from a IPFS path by using URL.createObjectURL☆12May 1, 2025Updated last year
- ☆28Feb 21, 2023Updated 3 years ago
- pyecharts map extension - china cities - python package☆11Nov 9, 2018Updated 7 years ago
- Travis, CircleCI, et. al. env vars normalized☆14May 18, 2023Updated 3 years ago
- Building a Desktop tool for experimenting with GLSL shaders☆33Jul 14, 2025Updated 11 months ago