After all conflicts are resolved, finalizes the merge with a commit

OAuth2

Diversion Documentation

Set up Diversion as your version control system.

Quickstart

Configure your CI/CD platform to use diversion

CI/CD

Complete customization and integration with Diversion via APIs

Introduction

Get a list of repositories accessibly by the authenticated user

List user's repositories

Create a repo

Get details of an existing repo.

Delete a repo. All files, workspaces, commits, branches permissions etc. associated with the repo will be deleted.

Delete a repo.

Import a Git repo with all history from a Git URL. `repo_id` must have no commits and no branches, or be already marked as synced with the same `git_url`. The git repo URL must have http credentials embedded or otherwise hosted on Github and the owner has the Diversion Github app integration set up.

Import a Git repo into this Diversion repo

The git repo URL must have http credentials embedded or otherwise hosted on Github and the owner has the Diversion Github app integration set up.

Check if a git repo could be imported to Diversion

Sync all history from Git. The repo must already be associated with a Git repo (see import).

Sync a Git repo to this Diversion repo

Get file tree snapshot. Either one of workspace, branch or commit ID needs to be specified as ref ID.

Get file tree snapshot for a nested tree path. Either one of workspace, branch or commit ID needs to be specified as ref ID.

Get object history in a ref by its latest path

Get file entry (either tree or blob). Either one of workspace, branch or commit ID needs to be specified.

Get blob contents snapshot. Either one of workspace, branch or commit ID needs to be specified.

Get blob contents using storage information, as retrieved from other APIs.

The operation reverts any changes done in the single commit represented by revert_ref_id (compared to its own parent). These opposing changes are then applied into the branch represented by base_id. If any changes were done between revert_ref_id and base_id, they will be checked for conflicts with the revert changes.


Revert commit

Create a workspace

Update workspace name

Set the workspace to follow a different branch or commit (checkout). Currently supports only moving to a branch with an identical commit as the workspace's current branch, or moving to any branch/commit if the workspace has no working changes.

Workspace checkout ref

Get updates needed to be applied by the client to this workspace

Get status of changes in workspace

Reset changes in workspace

Merge base branch into workspace

Get preferences of the current user

Update the preferences of the current user

Get list of potential clashes with files in other users' workspaces and branches

Get the current branch details

Update a branch

Get a list of all tags in the repo.

Create a tag

Get tag details

Delete a tag

Update a tag

Get a list of all shelves in the repo.

Create a shelf

Get shelf details

Delete a shelf

Apply a shelf onto a workspace

Upload file to a new or existing path

Delete a file from an existing path

Move a file to a different path

Request an upload link for async blob upload from client side

Details of a specific merge in progress

Close an open merge without resolving it

Accepts a change from one of the branches (base or other)

Update a conflicting file, potentially resolving the conflict.

Retrieve conflicted merges in this repo

Merge ref into a branch

Get all collaborators and pending invites for repo

Compare two refs (commit/branch/workspace/tag/tree) in this repo

Check server is alive

Get a presigned url that will be used to upload a support bundle

Ingest analytics events

Ingest analytics events without user context

Used for app installation events along with webhooks events used for repo sync.

An endpoint for Github app installation callbacks

Blog

Community

API Reference

Login

Support

Create a new Diversion repo for a completely new project or an existing one

Start using Diversion in your project

Get an existing project

Add people to your project

What to do with your changes

Working in parallel

Reverting to or branching from a previous commit

Going back in time

Undo changes you haven't committed yet with the `reset` command

Undo pending changes

Create a negative of a past commit with the `revert` command

Undo a previous commit

How to get an existing repo from Git into Diversion

Import from Git

How to get an existing repo that uses Git LFS into Diversion

Import from Git LFS

Pause/Resume sync

Repositories, Branches, and Workspaces

Use Diversion without leaving the Unreal Engine editor

Unreal Engine Plugin

UE Plugin - Solving Merge Conflicts

Overview

branch

Change current working directory for an interactive CLI session

clone

commit

checkout

diff

feedback

Get more information about Diversion's commands

help

import

init

invite

login

logout

merge

merge-preview

repo

reset

revert

share

status

support

unregister

update

verify

View the current workspace in a web browser

view

workspace

API Documentation

Repository Management

Repository Manipulation

Repository Commit Manipulation

Repository Workspace Manipulation

Repository Branch Manipulation

Repository Tag Manipulation

Repository Shelves Manipulation

File Mutation

Repository Merge Manipulation

Collaborators

Repository Content Comparison

Debug

Support

Analytics

Github App Integration

After all conflicts are resolved, finalizes the merge with a commit

Authorizations

Path Parameters

Body