merge -> rebase in experiment sync script text

weswigham · weswigham · commit dcf2fa930d71 · 2019-06-05T15:28:52.000-07:00
diff --git 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
             }

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ async function main() {`
`49`	`49`	`owner: "Microsoft",`
`50`	`50`	`repo: "TypeScript",`
`51`	`51`	`issue_number: num,`
`52`		- body: `This PR is configured as an experiment, and currently has merge conflicts with master - please rebase onto master and fix the conflicts.`
	`52`	+ body: `This PR is configured as an experiment, and currently has rebase conflicts with master - please rebase onto master and fix the conflicts.`
`53`	`53`	`});`
`54`		- throw new Error(`Merge conflict detected in PR ${num} with master`);
	`54`	+ throw new Error(`Rebase conflict detected in PR ${num} with master`);
`55`	`55`	`}`
`56`	`56`	`return; // A PR is currently in conflict, give up`
`57`	`57`	`}`