Skip to main content
To merge a branch or commit into the current checkout branch, you use the merge command:
<other_id> is the id of the branch or the commit you want to merge. [--into <branch>] specifies the destination branch to merge into. Defaults to the current branch. [--delete-branch] deletes the source branch after a successful merge. The repository’s default branch cannot be deleted. [--conflict_resolution <strategy>] sets how conflicts are handled:
  • manual — resolve conflicts manually via the app (default)
  • keep-destination — resolve all conflicts by keeping the destination branch’s changes
  • accept-incoming — resolve all conflicts by accepting the incoming source branch’s changes
[--nowait] returns immediately without waiting for the merged files to finish syncing to your local workspace. By default, the command waits until the sync is done.