paulaltin / git-hires-mergeView external linksLinks
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
☆68Jul 12, 2024Updated last year
Alternatives and similar repositories for git-hires-merge
Users that are interested in git-hires-merge are comparing it to the libraries listed below
Sorting:
- A custom Swift 4.2 Archiver that supports reference types☆13Jun 27, 2018Updated 7 years ago
- Cocoa/Objective-C TagLib framework☆33Jun 2, 2011Updated 14 years ago
- Haskell ctags/etags generator☆25Aug 19, 2023Updated 2 years ago
- A Swift Wrapper for PyTorch and Torchvision.☆14Jul 19, 2019Updated 6 years ago
- A complement to the Swift standard library.☆66Feb 7, 2026Updated last week
- Narrowed down reproduction of UIStackView hiding with animation bug☆29Nov 16, 2018Updated 7 years ago
- google app information ninja ,crawl google app information☆12Mar 1, 2015Updated 10 years ago
- A collection of scripts for use with git☆38Aug 22, 2023Updated 2 years ago
- ☆11Jul 25, 2025Updated 6 months ago
- 🌇 PHPickerViewController / UIImagePickerController for SwiftUI☆38Dec 1, 2022Updated 3 years ago
- A Kotlin Chess Engine☆36Aug 31, 2020Updated 5 years ago
- Genetic Programming Framework for Swift.☆43Dec 16, 2017Updated 8 years ago
- A lightweight packet-level OMNeT++ simulator designed to simulate large FatTree data center networks.☆11Nov 19, 2013Updated 12 years ago
- Source files for building OMNeT++ related docker images☆13Dec 8, 2025Updated 2 months ago
- pickle - Java object serialization library☆10Dec 2, 2023Updated 2 years ago
- Lexing library for Swift☆44May 5, 2025Updated 9 months ago
- Shell script manager for remote/local/container invocations in a <3MiB statically-linked executable.☆17Sep 7, 2025Updated 5 months ago
- Python implementation of the STAR Voting system☆10Dec 18, 2024Updated last year
- CrazyDiskInfo is an interactive TUI S.M.A.R.T viewer for Unix systems.☆10Aug 9, 2022Updated 3 years ago
- ☆10Mar 14, 2025Updated 11 months ago
- A Swift μ-framework for creating RFC6902-compliant JSON patch objects☆13Oct 16, 2024Updated last year
- ☆50Dec 17, 2025Updated last month
- Python wrapper around the Mac TIS functions to convert between chars and keycodes☆16Dec 1, 2015Updated 10 years ago
- A probot app for automatic issue duplicate detection☆11Oct 2, 2024Updated last year
- Modern bindings to Oracle odpic☆12Oct 26, 2025Updated 3 months ago
- ☆11Nov 29, 2024Updated last year
- iOS SDK to collect performance metrics easily using https://flowup.io☆11Jul 14, 2017Updated 8 years ago
- Example using a custom CIFilter with SpriteKit (for physics), filter consists of a CIGaussianBlur and CIColorMap (for thresholding the bl…☆14Sep 27, 2016Updated 9 years ago
- I wonder who I am, and what the purpose and summary of the branches that I made are.☆14Jun 29, 2015Updated 10 years ago
- Free up disk space with one command and zero config. Inspired by topgrade and BleachBit.☆12Nov 14, 2025Updated 3 months ago
- Fully native Flashpoint experience on Linux☆12Nov 19, 2024Updated last year
- SpotLight on Steroids☆14May 14, 2019Updated 6 years ago
- Wayland backend for Blender.☆15Jan 4, 2016Updated 10 years ago
- Rock climbing routes randerer for open street maps.☆11Nov 27, 2025Updated 2 months ago
- GPT-3 chatbot/scripting from the terminal command-line.☆10Nov 19, 2023Updated 2 years ago
- Code implementing game-theory based voting system by Emily Shen and Ron Rivest☆11Jan 24, 2014Updated 12 years ago
- A book about datalog☆12Nov 26, 2022Updated 3 years ago
- Source code for this blog post: http://marceldegraaf.net/2014/05/05/coreos-follow-up-sinatra-logstash-elasticsearch-kibana.html☆27May 4, 2014Updated 11 years ago
- ☆13Oct 4, 2022Updated 3 years ago