Documentation
Version Control
Branches, diffs, and merges at the entity level
Stellify has built-in version control designed around its structured code storage. Instead of tracking text diffs, branches track changes to entities — routes, files, methods, statements, elements — so you can see and merge exactly what changed.
Branches
Every project has a main branch. Create additional branches to work on features in isolation:
- Open the branch dropdown in the top navigation
- Click New Branch and give it a name
- Everything you edit now happens on that branch — main is untouched
While you're on a branch, your changes are invisible to collaborators on main (and conflict detection is skipped — the branch is your isolated copy).
Branch creation requires an active subscription. Plan tiers set how many branches you can keep (up to 300 on the highest tier); the free tier works on main only.
Diff
The Diff view shows every entity your branch has changed compared to main — added, modified, and deleted routes, files, methods, and elements. Because changes are tracked per entity rather than per line, the diff tells you what changed at the level you think about your app.
Merging
When the work is ready:
- Open the branch menu and choose Merge
- Review the diff
- Confirm — your branch's changes are applied to main
If main moved while you worked, conflicting entities are surfaced for resolution during the merge.
Discarding Changes
- Discard one entity — revert a single route, file, or method on your branch back to its main version
- Discard all — reset the entire branch to match main
Merge History
The History view lists past merges into main, so you can see when each batch of changes landed and who merged it.
Next Steps
- Edit Conflicts - How simultaneous edits on shared code are handled
- Collaborators - Working with a team
- Exporting Code - Push merged work to GitHub
- Previous
- Interface Builder
- Next
- Database Connection