Skip to main content

Merge and Deploy

Once your changes are in Git, you can continue with your usual development workflow to review, test, and merge your changes before they're released. This guide walks through how to:

  • Integrate features developed on other branches back into your branch
  • Merge changes into the default branch of your repository after they've been approved
  • Import changes back into Superblocks to release them to end-users

Merge branches​

As you build new features on branches, other developers may push their own features or bug fixes to your repository's default branch. Git lets you combine changes from other branches into your branch by merging.

Use your source control provider's UI or your local Git CLI to merge changes from a branch into your branch. After creating a merge commit, sync changes back into your branch in Superblocks.

caution

Before merging, make sure you've committed and pushed all changes in Superblocks to your git repository. Imports will overwrite your Application state in Superblocks. If you haven't committed, you may lose work.

Resolving conflicts​

Merge conflicts can occur when contributors make competing changes to your Application's files on different branches. This usually happens when a branch is merged to your repository's default branch that modifies the same APIs or components that you've updated on your branch.

When a conflict occurs, you can resolve it using either your git provider's UI or your local Git CLI.

Once the conflict is resolved and a resolution commit is pushed to your remote repository, sync changes back into your branch in Superblocks to test and validate your Application's changes.

Sync changes to Superblocks​

Changes can be synced back into Superblocks after your merge using:

  • GitHub Actions, GitLab Pipelines, or other popular CI tools
  • The Superblocks CLI directly from your terminal

Automatically sync changes​

CI integrations with GitHub Actions, GitLab Pipelines, and popular CI/CD tools like CircleCI let you automatically sync changes back to Superblocks every time you commit to your repository from outside of Superblocks.

Learn how to configure CI using

Manually import changes​

If not using CI to sync changes, you can also manually push changes back to Superblocks using the Superblocks CLI. Import changes using the CLI by running:

superblocks push --branch=[BRANCH_NAME]

This will create a new commit on your branch in Superblocks containing the updated state of your Application.

caution

Note that the superblocks push command only pushes the most recent commit on your branch. If you created multiple commits before pushing, you will not see all of them in Superblocks.

Deploy​

With Source Control in Superblocks, only changes on your repository's default branch can be released to end-users. Once changes on a branch have been merged and successfully synced back to Superblocks, you can deploy them from the Superblocks UI.

To deploy:

  1. Click on the Version Control panel icon
  2. Scroll to the Committed changes section
  3. Click the menu icon for your commit
  4. Click Deploy

Learn more more about deploying, managing deployed commits, and reverting.