The Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.
Screenshots
Install
If this does not work, see FAQ#1
If this button doesn't work, see FAQ #1
How to install?
Screenshots
Sites
Sources
Exact match
Name match
Description match
No applications found
No applications found matching "{0}"
Try selecting "All architectures" or broadening your search keywords.
Check for typos or try searching with different keywords.
Clear search
{0} results
Failed to load apps.