Format a diff3-style merge conflict by showing its underlying changes separately.
☆12Mar 5, 2026Updated 7 months ago
Alternatives and similar repositories for ConflictFormatter
Users that are interested in ConflictFormatter are comparing it to the libraries listed below. We may earn a commission when you buy through links labeled 'Ad' on this page.
Sorting:
- Publishing Scala libraries to Maven Central using GitHub Actions☆10Updated this week
- Tilings by regular polygons☆10May 24, 2026Updated 5 months ago
- Generation of test case data for Scala and Java, in the spirit of QuickCheck. When your test fails, it gives you a minimised failing test…☆23Updated this week
- Y.js 中文文档。它是对共享数据进行强大抽象的 CRDT 框架。☆14Oct 14, 2020Updated 6 years ago
- kryo-based serializers for Scala☆20Aug 20, 2026Updated 2 months ago
- GPUs on demand by Runpod - Special Offer Available • AdRun AI, ML, and HPC workloads on powerful cloud GPUs—without limits or wasted spend. Deploy GPUs in under a minute and pay by the second.
- GDB plugin for demngling D code in traceback☆10Dec 2, 2018Updated 7 years ago
- Code to accompany "Weightless Neural Networks for Efficient Edge Inference", PACT 2022☆23Nov 15, 2022Updated 3 years ago
- Command-line tool for working with BBC BASIC programs☆14Sep 14, 2025Updated last year
- A live terminal UI for ansible-playbook, for the person actually watching it run.☆23Updated this week
- ☆11Jun 29, 2024Updated 2 years ago
- intervals and interval sets for Scala☆20Jan 20, 2017Updated 9 years ago
- BBC Micro Emulator☆17Jul 6, 2017Updated 9 years ago
- Voting Example in circom☆19Oct 21, 2021Updated 5 years ago
- Build an Econet filestore out of an Arduino Due☆13Aug 5, 2020Updated 6 years ago
- Managed Database hosting by DigitalOcean • AdPostgreSQL, MySQL, MongoDB, Kafka, Valkey, and OpenSearch available. Automatically scale up storage and focus on building your apps.
- Immutable priority maps for Scala☆39Jan 12, 2017Updated 9 years ago
- The intuitive UI for IntelliMerge, where the developers can merge code and resolve conflicts.☆25Mar 28, 2024Updated 2 years ago
- Remove kernel lockdown after boot☆20Aug 8, 2022Updated 4 years ago
- Create wifi access points on the go (karma-like), simulate internet connectivity, gather whatever is sent ;)☆11Aug 7, 2025Updated last year
- The GRUB2 signing extension are some scripts which help you to verify, sign and unsign your GRUB2 bootloader files using GPG.☆23Jul 22, 2021Updated 5 years ago
- Extends the browser devtools with custom plugins directly from your localhost☆12Apr 13, 2022Updated 4 years ago
- A flexible slider for reactjs.☆13Mar 7, 2016Updated 10 years ago
- Linux kernel module for a Raspberry Pi (4) plus command line utilities and hardware interface diagram for a bridge between a hardware BBC…☆28Oct 17, 2026Updated last week
- Redux Saga based state machines☆12Jul 26, 2021Updated 5 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.
- REST HTTP vs Websockets: A performance comparison☆13Sep 6, 2018Updated 8 years ago
- Python module for using callbacks to resume your code☆15May 17, 2021Updated 5 years ago
- Parser-combinator in Go☆10Jul 19, 2020Updated 6 years ago
- GhostText Chrome extension☆12Feb 19, 2023Updated 3 years ago
- Open source implementation of multi-sets (or bags) for Scala collection☆52Aug 14, 2017Updated 9 years ago
- Go bindings for Mapbox GL Native☆15Feb 21, 2019Updated 7 years ago
- particle attractor, multiverse, ruby game programming tutorial & 2d engine☆15Jul 6, 2009Updated 17 years ago
- query-replace in Emacs with smarts and history!☆10Jul 24, 2021Updated 5 years ago
- My goal is to keep the pointing fingers on "F" and "J" as much as possible☆15Oct 2, 2026Updated 3 weeks ago
- Deploy on Railway without the complexity - Free Credits Offer • AdConnect your repo and Railway handles the rest with instant previews. Quickly provision container image services, databases, and storage volumes.
- ECMAScript parser written in C and compiled to WebAssembly.☆16Mar 30, 2021Updated 5 years ago
- A mode for instant JavaScript eval in Emacs☆10Nov 16, 2013Updated 12 years ago
- Org-babel support for blockdiag☆11Apr 25, 2021Updated 5 years ago
- A Javascript JSON DVCS underpinning a Smalltalk-like image holding code & data in a single HTML file. A bit like Tiddlywiki. Work in prog…☆44Oct 22, 2024Updated 2 years ago
- show flycheck errors in the frame title☆10Mar 21, 2021Updated 5 years ago
- Emacs Lisp color manipulation utilities.☆13Jul 16, 2024Updated 2 years ago
- A Language Features library for Emacs Lisp☆13Oct 13, 2026Updated 2 weeks ago