Taking typos out one line at a time
This commit is contained in:
parent
96a250502c
commit
e6fde9e809
|
@ -84,7 +84,7 @@ async function main() {
|
|||
const mergeTree = runSequence([
|
||||
["git", ["merge-tree", mergeBase.trim(), branch, "experimental"]]
|
||||
]);
|
||||
if (mergeTree.indexOf(`===${"="}===`)) { // 7 equals is the center of the merge conflict marker
|
||||
if (mergeTree.indexOf(`===${"="}===`) >= 0) { // 7 equals is the center of the merge conflict marker
|
||||
throw new Error(`Merge conflict detected involving PR ${branch} with other experiment`);
|
||||
}
|
||||
// Merge (always producing a merge commit)
|
||||
|
|
Loading…
Reference in a new issue