From dcf2fa930d7172ea6e8a541d439dcebea7836c00 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Wed, 5 Jun 2019 15:28:52 -0700
Subject: [PATCH] merge -> rebase in experiment sync script text

---
 scripts/update-experimental-branches.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/update-experimental-branches.js b/scripts/update-experimental-branches.js
index ddbf7a43827..4a496bbf783 100644
--- a/scripts/update-experimental-branches.js
+++ b/scripts/update-experimental-branches.js
@@ -49,9 +49,9 @@ async function main() {
                         owner: "Microsoft",
                         repo: "TypeScript",
                         issue_number: num,
-                        body: `This PR is configured as an experiment, and currently has merge conflicts with master - please rebase onto master and fix the conflicts.`
+                        body: `This PR is configured as an experiment, and currently has rebase conflicts with master - please rebase onto master and fix the conflicts.`
                     });
-                    throw new Error(`Merge conflict detected in PR ${num} with master`);
+                    throw new Error(`Rebase conflict detected in PR ${num} with master`);
                 }
                 return; // A PR is currently in conflict, give up
             }