Skip to content
ControlZebra Docs
Search
Ctrl
K
Cancel
GitHub Releases
Select theme
Dark
Light
Auto
Website Home
Introduction
Getting Started
Installation
First-Time Setup
Connect Accounts
Profile & Identity
Open a Project
Your First Checkpoint
Daily Startup Checklist
Core Workflows
Recommended Daily Workflow
Save Changes
Sync
Share
Merge
Conflict Resolution
Merge Action
History
Branches
Settings
App Settings
Appearance
Profile Identity
Connected Accounts
Repo Settings
Protected Branches
Large File Handling (LFS)
Background Tasks
Team Setup Guide
Troubleshooting
Setup Issues
Missing Tools
History Problems
Sync and Auth
Sync Fails
Authentication Expired
Merge Issues
Merge Conflicts
Stuck States
Performance
Large Files Slow
GitHub Releases
Select theme
Dark
Light
Auto
Conflict Resolution
Conflict Resolution
Section titled “Conflict Resolution”
Conflict choices are usually:
Keep Mine
: keep your version
Keep Theirs
: keep incoming version
Edit
: manually combine both