Prefer Git? If you’re using the Xano CLI for local development, you can use standard Git branching, diffs, and PRs alongside Xano’s push & pull workflow instead of Xano’s built-in branching. Use whichever fits your team — or both together.
Create a New Branch
Select the Branch identifier located in the footer.


Change which Branch to Edit and Set Live
The Branch you are currently editing will be identified in the status footer at the bottom of the screen.

Compare Differences (Compare Branches)
Comparing differences allows you to see the differences between a source branch and a destination branch. Comparing differences gives you full context into what’s going to change before you decide to merge branches.How to compare branches
To compare branches, select Compare Branches from the branches menu.
Step 1 - Select the branch to compare from
First, select the branch to compare from. This is considered the source branch.
Step 2 - Select the destination branch to compare to.
Next, select the destination branch to compare to. If you were to merge, this is the branch to merge into.Comparing mode will not commit to a merge; it is simply an opportunity to see and compare differences between the branches. You will only merge by selecting the merge option on the branches menu.


Merging
Merging Branches allows for seamless development management of different environments. It allows you to update a destination Branch with changes and updates created from a source Branch. Merging will include changes to published objects such as APIs, Functions, Addons, and Tasks, and newly created ones. For example, your live Branch is v1. You are editing v2, which has some new API endpoints for a new feature you are rolling out. During the development phase of v2, you had to modify an API endpoint in v1. When you’re ready to merge v2 into v1, Xano will add the new API endpoints from v2 and maintain the update to the API endpoint on the destination v1 Branch.How to Merge
To merge Branches, open the Branches menu by clicking the Branch name in the status footer at the bottom of the screen. Next, select Merge Branches.
The Source Branch is the Branch containing the updates and modifications that you want to merge into the Destination Branch.
Dealing with Merge Conflicts
1
Compare the differences between the branches to see where the conflict lies
Learn more about comparing branches here.
2
If you receive a merge conflict notice but there is no apparent conflict, you might have a function stack with the same name, but a different GUID.
Head to the settings of the function stack and choose Security.
You can update the GUID in the **destination branch **to match the function stack of the same name from the source branch


Workspace Triggers for Branch Merges
From your workspace settings, you have the option to enable triggers based on certain events.- Branch Live - Any time a branch status is set to live
- Branch Merge - When a branch is merged
- Branch New - When a new branch is created


- to_branch - Information regarding the destination branch
- from_branch - Information regarding the source branch
- action - The action taking place
Restoring a Branch Backup
If after you have merged branches, you would like to restore from a backed up branch, click on the branches option, and check the “Include Backups” checkbox. This will show you all available backups, which you can then click and edit or set live just like any other branches. Setting live the backed up branch will allow you to quickly roll back to before the merge was made.