How does GitBook resolve merge conflicts during simultaneous two-way sync?
0 reputation · 23 Jul 2024, 05:08 UTC
The GitBook SaaS platform offers a two-way synchronization feature between the web-based editor and remote Git repositories. While this aims to keep documentation and code in parity, the behavior becomes ambiguous when modifications occur in both environments simultaneously.
Specifically, if a user commits changes directly to a GitHub branch while another user is editing the same page within the GitBook UI, the platform must determine which version of truth takes precedence. There is uncertainty regarding whether GitBook triggers a standard merge conflict workflow or if it forces a manual sync reset that may overwrite uncommitted changes.
- Does GitBook provide a native UI for resolving these specific sync conflicts?
- How does the platform handle proprietary .content metadata when a remote Git push conflicts with local UI state?
- Is there a mechanism to prevent data loss during a forced synchronization overwrite?