Simplify team publishing with conflict resolution and domain tools

Never worry about Git conflicts again! Our most recent Beta features are now available, giving your team more autonomy to publish with confidence. These improvements reduce friction in your publishing workflow by providing intuitive conflict resolution tools and a more organized domain management experience.

Resolve Git conflicts right in the app # Direct link to this section

You no longer need to rely on external tools to resolve Git conflicts. When updating your site from its Publish Branch, CloudCannon now automatically detects conflicts and provides an intuitive interface to resolve them directly in the app.

We're especially grateful to our beta testers who helped refine this feature, and showed their appreciation for it in the Community.

The new conflict resolution workflow highlights changes from your current branch in red and incoming changes in green, allowing you to choose which version to keep or to manually create a hybrid solution. This feature is available to Owners, Developers, and Technical Editors, enabling more team members to participate in the publishing process.

View your site’s Publishing status at a glance # Direct link to this section

The Publishing page has been completely revamped with a new Summary tab that gives you immediate visibility into your site’s status.

This tab displays publishing options, files with saved changes, and recent commits — all in one place so you can quickly understand what needs attention. The Changes and Commits tabs have moved to the top of the page for better consistency with other areas of the app.

Manage all domains in one intuitive place # Direct link to this section

Domain management has been consolidated into a single, intuitive section. The new Domains browser shows all domains connected to your Organization with clear status indicators and metadata, making it easier to maintain your web presence.

The dedicated Domain page offers comprehensive management through four specialized tabs:

• Network: Manage nameservers, subdomains, and fallback redirects
• DNS: Configure and search DNS records
• Sites: View and navigate to connected sites
• Domain Settings: Configure domain options

Additional improvements # Direct link to this section

We've also enhanced the Source Editor with better syntax highlighting, conflict visualization, and multi-cursor editing capabilities. Plus, we've added a new “View diff” action to review unsaved changes with color-coded highlighting.

We're grateful to everyone who participated in our Publishing Conflict Resolution Beta. Your feedback helped shape these features and is always valuable to our team.

There's a lot more to dig into! All of the new changes are explained in full over at our changelog. And if you have any questions or need assistance with these new features, don't hesitate to contact us in the new CloudCannon Community, or via our regular Support channels.