From 79116b1b55a3672cc11c5beed2700ca7fe8b8ac3 Mon Sep 17 00:00:00 2001 From: DeAndre Harris <8107071+deandre@users.noreply.github.com> Date: Wed, 4 Dec 2024 07:51:33 -0600 Subject: [PATCH] Clarifies that preferMergedBaselines is a feature request --- .prettierrc | 1 + .tool-versions | 1 + src/content/snapshot/branching-and-baselines.md | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .prettierrc create mode 100644 .tool-versions diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/.prettierrc @@ -0,0 +1 @@ +{} diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..02fda068 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 20.14.0 diff --git a/src/content/snapshot/branching-and-baselines.md b/src/content/snapshot/branching-and-baselines.md index 22d4080c..e2f0c6df 100644 --- a/src/content/snapshot/branching-and-baselines.md +++ b/src/content/snapshot/branching-and-baselines.md @@ -103,7 +103,7 @@ To ensure that Chromatic uses the correct baseline with “squash” or “rebas
-How can I avoid re-accepting other’s changes when I update my branch? +Why do I have to re-accept other’s changes when I update my branch? 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. @@ -111,7 +111,7 @@ Consider a busy repository where many people are working on the same UI. An issu 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:support@chromatic.com) 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:support@chromatic.com) support to express your interest in the feature request for the `preferMergedBaselines` feature.