An Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.
☆25Mar 10, 2018Updated 7 years ago
Alternatives and similar repositories for ConflictResolver
Users that are interested in ConflictResolver are comparing it to the libraries listed below
Sorting:
- Swift 动态桥接库☆13Nov 28, 2019Updated 6 years ago
- ☆17Mar 19, 2018Updated 7 years ago
- Unity Package for Serialisable Data Structures☆14Nov 14, 2024Updated last year
- GameLiftAgent is a Java application that is used to launch game server processes on Amazon GameLift fleets.☆17Dec 30, 2024Updated last year
- Project Tiny enables you to create lightweight Web-based games using the Unity Editor. 📦 [Mirrored from UPM, not affiliated with Unity T…☆11Jul 23, 2021Updated 4 years ago
- Flow-based programming framework☆15Apr 9, 2018Updated 7 years ago
- nutz中使用xml管理sql模版（默认beetl引擎渲染，可自定义扩展为其他模版引擎）☆10Jan 21, 2022Updated 4 years ago
- Checkers for iMessage☆12Dec 24, 2018Updated 7 years ago
- jackknife的子项目——自动设置布局、绑定控件、注册事件，请务必使用2.6.2版本☆10Sep 25, 2018Updated 7 years ago
- Minimalist Operating System designed to implement as much functionality as possible with a budget of 1000 Lines of Code☆12Sep 28, 2016Updated 9 years ago
- Guntattchment Saga The Sequel☆12Oct 29, 2019Updated 6 years ago
- myblog☆12Feb 27, 2018Updated 8 years ago
- A C++ header-only library for run-time dimensional analysis and unit/quantity manipulation and conversion☆12Dec 4, 2022Updated 3 years ago
- Write mach-o minidumps that can be analyzed with lldb☆12Nov 12, 2020Updated 5 years ago
- A very basic 160 4bpp snes superfx demo☆16Sep 10, 2024Updated last year
- A Mod that lets you display Player values, Faction Ranks in Custom Windows. There is a Window for inside the Inventory Menu as well that …☆16Nov 24, 2024Updated last year
- A stupidly simple Godot plugin to enable support for .kra/.ora files☆18Feb 14, 2026Updated 2 weeks ago
- A work-in-progress reimplementation of Grand Theft Auto 2.☆11Mar 5, 2024Updated last year
- glsl-like scripting language for rapid prototyping of multipass rendering techniques☆13Feb 10, 2026Updated 2 weeks ago
- ☆11Aug 16, 2017Updated 8 years ago
- Blur effect cover view in iOS 5 or later☆21Dec 16, 2013Updated 12 years ago
- C++14 CSV Stream based on C File API☆10Mar 25, 2022Updated 3 years ago
- Basic Win32 MDI GUI application which can be built using Visual Studio.☆12Nov 26, 2017Updated 8 years ago
- C# extension methods adding in commonly used patterns that are absent as methods☆20Feb 27, 2015Updated 11 years ago
- NSTask but with the ability to run privileged code☆11Apr 16, 2019Updated 6 years ago
- Single header library about immediate-mode rendering for C++☆10Oct 24, 2025Updated 4 months ago
- Magnetometer☆11Feb 12, 2025Updated last year
- Abandoned☆31Feb 14, 2014Updated 12 years ago
- Tiny Rogue is a roguelike gameplay prototype made with Unity Project Tiny for mobile and web. The dungeon is procedurally generated with …☆12Aug 21, 2021Updated 4 years ago
- The GPT-4 function calls used in everchanging quest for the HF game jam☆10Jul 9, 2023Updated 2 years ago
- 🧊 Specification for Universal Shading Language (In Progress)☆17May 10, 2025Updated 9 months ago
- 分享云盘的资料，不定时更新（懒）☆17Nov 26, 2018Updated 7 years ago
- std extensions library☆13Jul 23, 2017Updated 8 years ago
- ☆12Nov 16, 2019Updated 6 years ago
- Code accompanying the Medium article "Dependency Injection for Games"☆14Sep 3, 2023Updated 2 years ago
- Auto import header in Xcode 8☆11Aug 25, 2020Updated 5 years ago
- This is a Unity project that based on Scriptable Objects. In this project, i have practiced with SO and events that created with SO. Also…☆10Mar 31, 2021Updated 4 years ago
- Documentation for the first 8 versions of DirectX and Direct3D☆13Jan 16, 2025Updated last year
- Scraper built with Scrapy.☆18Aug 14, 2024Updated last year