Document three-way merge for git-to-editor sync#5303
Open
mintlify[bot] wants to merge 1 commit intomainfrom
Open
Document three-way merge for git-to-editor sync#5303mintlify[bot] wants to merge 1 commit intomainfrom
mintlify[bot] wants to merge 1 commit intomainfrom
Conversation
Generated-By: mintlify-agent
Contributor
Author
|
Preview deployment for your docs. Learn more about Mintlify Previews.
|
Contributor
|
Preview deployment for your docs. Learn more about Mintlify Previews.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The web editor now uses a three-way merge when syncing incoming Git changes, preserving local unsaved edits instead of overwriting them. Conflicts are highlighted in the editor for manual resolution. This also adds GitLab support for git-to-editor sync and skips sync for commits originating from the editor.
Changes
Note
Low Risk
Low risk documentation-only update that clarifies how the web editor incorporates incoming Git changes and surfaces conflicts.
Overview
Adds a new "How Git changes sync to the editor" section to
editor/git-essentials.mdx, documenting that incoming repo updates are incorporated via a three-way merge (base/local/remote), auto-applying non-overlapping changes and highlighting conflicts; also notes that commits created in the editor don’t trigger a sync back.Updates
editor/publish.mdxconflict guidance to include incoming Git changes overlapping with unsaved edits, explains the editor’s automatic merge behavior, and links to the new Git essentials section for details.Reviewed by Cursor Bugbot for commit 96abacf. Bugbot is set up for automated code reviews on this repo. Configure here.