Getting started

Connect an application to a Git repository

A newly created UI Bakery app, or an app that is already developed, can be connected to a Git repository. Here are the steps on how to get started:

1. Create a new app or open an existing one.

2. Navigate to your Git provider and create a new https://github.com/new repository. The repository must be empty.

3. In UI Bakery, click the Connect to Git button in the top left corner.

4. Copy an ssh repository URL (such as [e-mail]:user/fictional-octo-happiness.git) and paste it into the Git repository URL field in the Git tab of the app settings.

5. Copy an SSH key suggested by UI Bakery and create a new key under the Deploy keys settings. Here's a guide on how to do this on GitHub:

   1. Open your repository settings and go to Deploy keys.

   2. Click Add deploy key and paste the key.

   3. Click Allow write access. - Click Add key.

6. Press Connect and wait for the app to be pushed to the Git repository.

Now your app is converted to a Git repository and you can start working with it.

Git controls overview

1. Branches selector - switch between branches.

2. Sync branches - sync branches list with the Git repository.

3. Pull - pull the latest changes from the selected branch.

4. Create Pull Request - create a pull request for the selected branch.

5. Commit & Push - commit and push the changes to the selected branch.

Develop a new feature

Here's an overview of the steps you need to take to develop a new feature:

1. Go to the main branch and pull the latest changes.

2. Create a new branch from the main branch.

3. Make changes to the app.

4. Commit and push the changes to the Git repository.

5. Create a pull request to merge the changes to the main branch.

6. Once the PR is approved and merged, pull the changes to the UI Bakery main instance.

Once the changes are pulled to the UI Bakery instance, you can review and deploy them using the standard UI Bakery workflow.

Merge conflicts

UI Bakery app is split into multiple files and folders, which makes it easy to avoid merge conflicts. However, if you stumble upon a merge conflict while merging a PR, this means that the main branch was changed while you were working on your feature branch.

To resolve the conflict, you need to pull the latest changes from the main branch to your feature branch and resolve the conflicts manually using the Git provider UI.