CyanPrintExplanation
3-Way Merge
How CyanPrint updates preserve your local changes
3-Way Merge
When updating a project, CyanPrint uses a 3-way merge to preserve your customizations.
How It Works
The merge considers three versions:
- Base: Original template version you used
- Yours: Your modified project files
- Theirs: New template version
The merge combines your changes with template updates automatically.
Conflict Resolution
Conflicts May Occur
If conflicts occur, you'll be prompted to resolve them manually. This happens when:
- You and the template both modified the same line
- Structural changes conflict