When your trunk (main/master) changes—or you need to revise something mid-stack—mg streamlines the process with commands like mg sync, mg modify, and more.

Prerequisites - Create a stack - Familiarity with mg push and basic Git conflict resolution

​
1. Sync with remote changes

mg sync
1

Fetch new commits

mg fetches new commits from main.
2

Clean up merged branches

mg prompts to delete merged branches.

3

Restack branches

mg restacks any child branches on top of the updated trunk.

If conflicts appear, follow the on-screen instructions to resolve them and run mg continue.

​
2. Update mid-stack branches

1

Switch to the branch

bash mg checkout feature_2
2

Make changes and commit

bash mg add . mg commit -m "Address feedback" # or mg modify to amend

3

Handle restacking

mg automatically re-stacks child branches on top. If you see conflicts, fix them, mg add ., then mg continue.

​
3. Push again

After local changes:

mg push

Or push everything at once:

mg push --all

Your PRs update on mrge.io / GitHub accordingly.

​
4. Orphan / adopt branches

1

Orphan a branch

Remove a branch from the stack but keep it in Git:

mg orphan <branch>
2

Adopt a branch

Bring an existing Git branch into mg’s stack:

mg adopt <branch>

​
5. Splitting or folding commits

1

Split commits

Breaks large commits into smaller ones: bash mg split

2

Fold/squash commits

If you want to combine commits: bash mg split --fold

​
Done!

Your stack is in sync with trunk. Each branch can be pushed or merged independently.

Happy syncing!

Was this page helpful?