MAGFAST INTERNAL RESOURCE

Branches: how to work safely without slowing everyone down

Branches: how to work safely without slowing everyone down

Branches are separate workspaces for changes that are not ready for main yet. They let someone build, test, and share a preview without touching the live site until the work is intentionally merged.

Branches are separate workspaces for changes that are not ready for main yet. They let someone build, test, and share a preview without touching the live site until the work is intentionally merged.

Key point

Manual vs auto publishing is a shared site-wide setting, not a personal preference. If one teammate changes main to auto, main is auto for everyone with access to that project.

Example: why a branch is useful

Amanda needs to update the investor page while Eric is changing the homepage. Amanda creates a branch, edits the investor page, and shares the branch preview. Eric can keep working separately. Nothing on main changes until Amanda merges her branch. If main is set to auto publish, that merge can become the step that ships the change, saving the extra manual publish/deploy step.

1. Branch

Create a safe workspace for the change.

2. Preview

Review without changing main or live.

3. Merge

Move approved changes into main.

4. Ship

Auto publishing can make merge the final step.

What am I seeing in the branches panel?

What am I seeing in the branches panel?

The branches listed on the left are project branches, not page-specific branches. A branch can include changes across any number of pages, components, CMS items, code files, or site settings. So you might see branches even when nobody has made a branch specifically for the page you are looking at.

The branches listed on the left are project branches, not page-specific branches. A branch can include changes across any number of pages, components, CMS items, code files, or site settings. So you might see branches even when nobody has made a branch specifically for the page you are looking at.

Left side: branches

This is the list of project workspaces. Main is the shared source branch; the other names are separate workspaces that can later merge back into main.

Right side: changes

This shows what the selected branch has changed. A page appearing here means that page has edits in the selected branch.

Why am I in a branch?

Framer can place you in a branch automatically when edits are being isolated from main. If the current branch is not main, your edits are going into that branch until you switch or merge.

Remember

A branch is site-wide. It is not limited to the current page. Before editing, confirm which branch you are on and whether that branch is the right place for your change.

A branch is site-wide. It is not limited to the current page. Before editing, confirm which branch you are on and whether that branch is the right place for your change.

Specifics coworkers ask about

Specifics coworkers ask about

Is manual/auto personal?

No. It is shared for the branch/site. The most recent setting change wins for everyone who uses that branch.

If two branches edit the same thing, who wins?

The branch that merges later is the one that can overwrite the earlier result, especially if both changed the same page, text, component, or setting. Merge order matters.

What if one person has two branches?

Treat them like two separate teammates. Each branch has its own snapshot and changes. If both touch the same thing, whichever branch is merged later can change what the first branch already put into main.

How should I think about overwrites?

Branches do not magically combine intent. If two branches change different pages, they usually merge cleanly. If they change the same object, page, or site setting, review carefully before and after merging.

How can branches save publishing steps?

With auto publishing on main, the team can review on a branch preview, merge when approved, and let that merge ship the update. That removes the separate “remember to publish” step.

When is manual still safer?

Use manual if the team often merges work before final approval, needs a scheduled release moment, or wants one last publishing gate after multiple branches land.

I see existing branches. What should I do before editing?

I see existing branches. What should I do before editing?

Pause and check what those branches are for. The small avatar/icon next to each branch usually indicates the person associated with that branch, often the creator or most recent person working there. If one already contains the work area you need, switch to it or coordinate with that person. If your edit is unrelated, create your own branch. Avoid editing main unless the change is tiny, safe, and clearly ready to ship.

Should I ever edit a branch I didn’t create?

It’s not automatically rude, but surprise-editing someone else’s branch is risky. Treat a branch like someone’s workspace: ask first, leave a note, or make your own branch unless you were invited to help, it is clearly a shared branch, or you are making a tiny urgent fix. The polite rule is simple: don’t change another person’s branch in a way that could change their plan without checking with them.

Recommended team workflow

Recommended team workflow

1. Create a branch for work that is risky, unfinished, or needs review.

1. Create a branch for work that is risky, unfinished, or needs review.

2. Share the branch preview instead of editing main directly.

2. Share the branch preview instead of editing main directly.

3. Before merging, ask whether another branch changed the same page, component, CMS data, code file, or site setting.

3. Before merging, ask whether another branch changed the same page, component, CMS data, code file, or site setting.

4. If main is auto publishing, treat merge as the release step. If main is manual, merge first and publish intentionally afterward.

4. If main is auto publishing, treat merge as the release step. If main is manual, merge first and publish intentionally afterward.

5. After merging, quickly check the live or preview result so the team catches accidental overwrites early.

5. After merging, quickly check the live or preview result so the team catches accidental overwrites early.

Have more questions?

Have more questions?

Ask Framer Agent to update this page with your question answered, so that we all benefit in the learning.

Ask Framer Agent to update this page with your question answered, so that we all benefit in the learning.