Overview
git that merges by what changed, not by text lines — so your team and your AI agents work on the same code at once without the conflicts that never needed to happen.
gitevolved is a free, open-source upgrade to git. Git merges text line-by-line, so it flags a conflict whenever two edits land near each other — even when they don't actually clash. gitevolved instead records what you did (added a function, renamed a symbol, rewrote a block) as a structured operation, so edits to different parts of the same file combine cleanly and both land.
Honest scope: only edits that don't overlap the same code
merge automatically. Edits that genuinely change the same code still ask a human —
gitevolved just stops inventing the conflicts that never needed to happen.
The three things to know
- It merges by operation, not by line — non-overlapping edits to one file just combine.
- It's still git —
git clone,git commit,git pushall work, andgit push originto GitHub is untouched. It shells out to your real, installed git; it never forks it. - It's multiplayer — many people and many AI agents edit one codebase at once and stay in sync. (The local client is free + offline; a paid hosted cloud keeps a team in sync.)
Where to go next
- Getting started — install and your first clone/push.
- How it works — operations vs. lines, and why that removes false conflicts.
- AI-agent setup — let Claude Code / Codex / Gemini install it for you.