Three-way merge & history

Your translations can change in three places at once: someone edits a string in the editor, a teammate changes the source file in your repo, and an automated run fills in the gaps. Now Localesy keeps all three in sync, automatically.

The problem

Localization is a moving target. The source copy in your codebase keeps changing, your team keeps refining wording in the editor, and Localesy keeps translating in the background. When two of those happen between syncs, something has to reconcile them, and a simple last-write-wins approach can quietly drop whichever change came in slower.

That is the exact situation version control solved for code decades ago, and translations deserve the same safety net.

What we shipped

Localesy now does a proper three-way merge: it compares your edits, the incoming changes from your repo, and the last shared state, then combines them. Non-conflicting changes merge automatically. When two sides genuinely disagree, you get a clear diff to resolve, so every change is preserved and accounted for.

Every change is also recorded in a full history, visible right on the project dashboard. You can see what changed, when, and roll back to restore any previous state in a click.

How to use it

It is on by default. Open any project, look for the History panel on the dashboard, and use Restore on any entry to roll back. The next time an edit and a repo change meet, you will get a clear merge view to resolve it.

This one has been a long time coming, and it is the foundation for a lot of the collaboration work landing next.