From ec727795769a526bd38c89f93fcab63b5113b1dd Mon Sep 17 00:00:00 2001 From: "mintlify[bot]" <109931778+mintlify[bot]@users.noreply.github.com> Date: Fri, 5 Dec 2025 02:14:48 +0000 Subject: [PATCH 1/2] Update editor.mdx --- editor.mdx | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/editor.mdx b/editor.mdx index bae5ff72d..7d394244a 100644 --- a/editor.mdx +++ b/editor.mdx @@ -248,11 +248,33 @@ In Markdown mode, you can directly edit the MDX of your pages. This can be helpf See [Format text](/create/text) and [Format code](/create/code) for more information on how to write using MDX syntax. +## Git synchronization + +The editor pins files to a specific version when you first open them. This prevents automatic upstream syncs during editing and ensures a stable editing experience. + +### How version pinning works + +When you open the editor, all files are pinned to the current commit of your branch. This means: + +- Files remain at the version you started with, even if changes are pushed to your branch from outside the editor +- You can edit without worrying about conflicts from upstream changes +- All files you open during your editing session use the same version + +### Handling upstream changes + +If changes are made to your deployment branch while you're editing: + +- You'll see a notification informing you that upstream changes exist +- Your local changes remain on the pinned version +- Publishing your changes will sync your branch to the latest version and apply your edits + +This workflow ensures you can focus on your edits without interruption while maintaining the ability to incorporate upstream changes when you're ready to publish. + ## Publish your changes The branch that you work on determines how the editor publishes your changes: -- **Deployment branch**: Publishing updates your live site immediately. +- **Deployment branch**: Publishing updates your live site immediately and syncs to the latest version. - **Other branches**: Publishing creates a pull request so you can review changes before deploying them to production. From 69f849f41fc762b9d3b5901e3787cbfbaccd6faf Mon Sep 17 00:00:00 2001 From: "mintlify[bot]" <109931778+mintlify[bot]@users.noreply.github.com> Date: Fri, 5 Dec 2025 02:14:57 +0000 Subject: [PATCH 2/2] Update guides/branches.mdx --- guides/branches.mdx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/guides/branches.mdx b/guides/branches.mdx index b5c32e3ee..0cf23a7e5 100644 --- a/guides/branches.mdx +++ b/guides/branches.mdx @@ -35,3 +35,13 @@ To save your changes on a branch, select the **Save Changes** button in the top- Unsaved changes are lost when switching branches. Make sure to save or publish your work before switching branches. + +## Version pinning and upstream changes + +When you open the editor, your files are pinned to a specific version of your branch. This means: + +- Unsaved changes stay on the same version even if upstream changes occur in your repository +- You can edit without interruption from external commits +- Publishing will sync to the latest version and apply your changes + +This ensures a stable editing experience while maintaining the ability to incorporate the latest changes when you publish.