Branches and Merging

Branches let you work on API changes in isolation, then merge them back. Vegha’s native git UI handles branch creation, checkout, and merging, including a dedicated resolver for conflicts.

Creating and switching branches

From the Source Control panel you can:

• Create a branch from the current commit
• Checkout a branch to switch your working copy to it

Switching branches updates the .bru files on disk to match that branch’s history, so the workspace always reflects the branch you have checked out.

Tip

Commit or stash your changes before checking out another branch so no work is left behind.

Merging

Merging brings the commits from one branch into another. Check out the branch you want to merge into, then merge the source branch. When the two branches changed different files — or different parts of the same file — git completes the merge automatically.

Resolving conflicts

When both branches edit the same lines of a .bru file, the merge cannot complete automatically and Vegha opens the three-pane merge-conflict resolver:

Pane	Shows
Local	Your current branch’s version
Incoming	The version from the branch being merged
Result	The merged output you are building

Work through each conflict by choosing the local side, the incoming side, or a combination. A live preview of the result updates as you make choices, so you can see the final .bru file before committing it.

When every conflict is resolved, save the result and commit the merge.

Plain text makes conflicts readable

Because collections are .bru text files, a conflict is usually a small, local change — a header, a URL, a body field — rather than an opaque binary clash.

Caution

After resolving conflicts, send the affected requests to confirm the merged result behaves as intended before pushing.