open source · apache-2.0 · still git

Your team and your AI agents, on the same code at once —
without the conflicts that never needed to happen.

gitevolved is a free upgrade to git that merges by what changed — you added a function, your teammate renamed another — not by text lines. So when two people edit different parts of the same file, both edits just apply. It's still git: git push origin to GitHub works exactly as today.

Honest version: edits that genuinely touch the same code still ask a human — gitevolved just stops inventing the conflicts that don't.

Install — built AI-first, so let your agent do it
Install gitevolved from github.com/do-awesome-ai/gitevolved, then make sure git clone dosource://cloud/<repo> works.
Paste that to Claude Code, Codex, Gemini, Aider — any coding agent. It reads the repo's AGENTS.md and sets everything up.  ·  prefer to install it yourself? →

Git flags conflicts that never needed to happen.

Git merges text line-by-line, so it stops you with a conflict whenever two edits land near each other — even when they don't actually clash. You change the top of a file, your teammate changes the bottom, and git still makes someone untangle it by hand. Now add AI: one developer runs several coding assistants, all editing the same repo, producing changes faster than anyone can merge them. The work stops being writing code and starts being resolving merges that line-diffing invented.

Merge by meaning, not by lines.

gitevolved records what you did — added a function, renamed a symbol, rewrote a block — as a structured change, not just which lines moved. Edits to different parts of a file are different changes, so they combine cleanly and both land with nothing to resolve. When two people genuinely change the same code, gitevolved still asks a human. Underneath it runs your real, installed git (it never forks it), so clone / commit / push behave exactly as you expect.

operations, not lines

Records the change

It knows you added a function vs. moved a line — so non-overlapping edits combine instead of colliding.

still git

Nothing you do breaks

Every git command you know still works. git push origin to GitHub is untouched. No fork.

works offline

Runs on your laptop

The engine is local. No account needed to record, merge, or export to a normal git commit.

open source

Free, Apache-2.0

The local tool is free forever. Read every line; contribute under the DCO.

Two writers, one file, both landed.

We ran it: two developers pushed changes to the same file at the same moment.

plain git
CONFLICT (content): merge conflict in app.go

Everyone stops. Someone reads the conflict markers and merges it by hand before anyone can move on.

gitevolved
both changes saved. 0 conflicts.

Both edits landed automatically. Neither developer had to stop and resolve anything.

~/our-app
# it's just a git remote — clone a hosted repo straight from the cloud
$ git clone dosource://cloud/our-app
Cloning into 'our-app'... done.

# you and a teammate push the same file at the same moment — both land
$ git push dosource://cloud/our-app
  both changes saved. no conflict to resolve.

# your GitHub workflow is never touched
$ git push origin main   # works exactly as before

Install it yourself.

The easiest path is to let your AI agent do it (top of the page). Prefer to run it by hand? One command (needs Go):

install
$ go install github.com/do-awesome-ai/gitevolved/cmd/git-remote-dosource@latest
# now: git clone dosource://cloud/<repo>

Full install (all three tools, or no-Go prebuilt binaries) → docs.gitevolved.ai

Free where it should be.

The local tool is free and open-source, forever — a genuinely better git for you and your machine. A paid hosted cloud keeps a whole team, and all their agents, working on the same codebase in sync. A solo developer never has to pay.

  • Open & free: the local engine, the merge, the git remote-helper — all of it.
  • Yours, offline: a real history of your changes on your own machine, zero cloud.
  • Team cloud (paid): everyone — people and agents — stays in sync on one codebase.
  • Never crippleware: the free tier is the real thing, not a trial.