Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/publish.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<img src="/images/editor/toolbar-branch-dark.png" alt="Web editor toolbar showing one pending change and the Save in branch button on a feature branch." className="hidden dark:block" />
</Frame>

To discard changes, click **Undo changes** beside a file name in the files changed dropdown.
To discard changes, click **Undo changes** beside a filename in the files changed dropdown.

### Publish your changes

Click **Publish** in the toolbar. Depending on your workflow, your changes deploy immediately or create a pull request for you to merge in your Git provider. If you are on a feature branch, save your changes before publishing.

The **Publish** button is disabled when there are no pending changes or when a pull request for the current branch is already open.

Check warning on line 56 in editor/publish.mdx

View check run for this annotation

Mintlify / Mintlify Validation (mintlify) - vale-spellcheck

editor/publish.mdx#L56

In general, use active voice instead of passive voice ('is disabled').

## Resolve conflicts

Expand All @@ -64,7 +64,7 @@
Conflicts happen when:

- You and another team member edit the same lines in a file.
- Files are moved or deleted in one branch but modified in another.

Check warning on line 67 in editor/publish.mdx

View check run for this annotation

Mintlify / Mintlify Validation (mintlify) - vale-spellcheck

editor/publish.mdx#L67

In general, use active voice instead of passive voice ('are moved').

### Resolve conflicts

Expand Down