All articles

Getting Started

What is CICDoo "Getting started: the onboarding wizard" The Dashboard and Infrastructure Map

Concepts

Production, staging and development stages Domains, subdomains and SSL Odoo versions and editions (Community vs Enterprise) Workspaces and team collaboration

Servers

Adding a server Server domains and DNS Using a load balancer "Server actions: deploy, logs and charts"

Projects & Git

Creating a project Connecting GitHub Connecting GitLab Branches and instances

Instances & Console

Creating an instance Restarting, stopping and removing an instance Merging branches between stages Web IDE and remote access Instance settings explained Deployments and the job queue

Monitoring & Backups

Monitoring your instance Backups and restore Alert notifications (email and SMS)

Workspaces & Permissions

Inviting workspace members Member permissions and resource access A member cannot see or use a resource

Account & Security

Two-factor authentication (2FA) Profile and integrations settings Passwords and account recovery

Billing & Plans

"Plans: Free, Pro and Enterprise" Upgrading and managing your subscription What happens when you hit a plan limit

Support & Tickets

Opening a support ticket Getting help from the CICDoo team

Troubleshooting

"Troubleshooting: cannot connect a server" "Troubleshooting: a deployment failed" "Troubleshooting: my instance is down or slow" "Troubleshooting: domain or SSL problems"

Instances & Console

Merging branches between stages

How to merge an instance branch into a target branch to promote work between development, staging, and production.

What the Merge action does

Every instance in CICDoo is tied to a git branch. When work on one branch is ready to move forward, you merge it into another branch. The instance running the target branch then picks up the merged code through a deployment.

How to merge

  1. Open the instance whose branch you want to merge (the source).
  2. In the quick actions row under the instance header, click Merge.
  3. In the Merge Branch dialog, type the target branch name (for example, main).
  4. Click Merge.

The merge runs as a job in the queue. Open the Queue tab to watch its status and read the log, see Deployments and the job queue.

Typical flow: development to staging to production

A common promotion flow looks like this:

  • Build and test a feature on a Development instance.
  • Merge the development branch into your Staging branch and verify the result on the staging instance.
  • When staging looks good, merge the staging branch into your Production branch to release it.

The Merge dialog is a free text field, so double-check the target branch name before confirming. Merging into the wrong branch triggers a deployment on whatever instance runs that branch.

Plan and permission requirements

  • Plan gating: branch merging is not included in the Free plan. It is available on Pro and Enterprise plans. Current prices are on the pricing page at cicdoo.com.
  • Workspace permissions: in a workspace, the Merge button is only shown to members who have the instance merge permission. If you do not see it, ask the workspace owner.

After the merge

The target instance deploys the merged code. If you also want modules upgraded on the target instance, run a Soft Restart there, see Restarting, stopping and removing an instance. If the merge job fails, open its log from the Queue tab to see the reason (for example, a merge conflict that has to be resolved in git).

If you get stuck, open a support ticket from the Tickets page or the chat widget.

Previous Restarting, stopping and removing an instance Next Web IDE and remote access

Still stuck? Open a ticket from the app or talk to an engineer.