Skip to content

Commit

Permalink
Clarifies that preferMergedBaselines is a feature request
Browse files Browse the repository at this point in the history
  • Loading branch information
deandre committed Dec 4, 2024
1 parent cf6e4ac commit 79116b1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 20.14.0
4 changes: 2 additions & 2 deletions src/content/snapshot/branching-and-baselines.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ To ensure that Chromatic uses the correct baseline with “squash” or “rebas
</details>

<details>
<summary>How can I avoid re-accepting other’s changes when I update my branch?</summary>
<summary>Why do I have to re-accept other’s changes when I update my branch?</summary>

When merging, Chromatic has to compare two branches and pick a baseline for each story. By default, Chromatic chooses the baseline that was most recently accepted.

Consider a busy repository where many people are working on the same UI. An issue occurs when you merge someone else’s changes into your branch (e.g., when you git pull) and they’ve touched the same stories as you.

As Chromatic picks the latest accepted changes, that can often mean it picks your baselines instead of incoming baselines. This results in you having to re-accept the changes the other person made which you might not have the context on.

While Chromatic’s default of choosing latest accepted baseline works for most teams, you may want to change the behavior for your team. If you want Chromatic to always prefer the “incoming” baselines to avoid re-accepting changes, please [email](mailto:[email protected]) support and request the `preferMergedBaselines` feature be enabled for your account.
Chromatic’s default of choosing latest accepted baseline works for most teams. If you want Chromatic to always prefer the “incoming” baselines to avoid re-accepting changes, please [email](mailto:[email protected]) support to express your interest in the feature request for the `preferMergedBaselines` feature.

</details>

Expand Down

0 comments on commit 79116b1

Please sign in to comment.