TypeScript Bot Sync Is Broken

[DanielRosenwasser]

#38510 (comment)

https://github.com/microsoft/TypeScript/runs/939136680?check_suite_focus=true

Run git config user.email "ts_bot@rcavanaugh.com"
  git config user.email "ts_bot@rcavanaugh.com"
  git config user.name "TypeScript Bot"
  git fetch origin master
  git merge master --no-ff
  npm install
  npm test
  git push
  shell: /bin/bash -e {0}
From https://github.com/microsoft/TypeScript
 * branch              master     -> FETCH_HEAD
 * [new branch]        master     -> origin/master
merge: master - not something we can merge

Did you mean this?
	origin/master

[orta]

Could be using the checkout action which doesn't grab history

[DanielRosenwasser]

Just switching to merging from origin/master would do it though, right?

[weswigham]

It needs a fetch command now, to get the ref.

[weswigham]

But moreover, I probably wanna change it to actually delete the branch, then rebranch master, reset the version, and re-lkg; so none of this merge conflict malarkey happens when people cherry pick before they were supposed to.

[weswigham]

I added a workflow trigger (so you can trigger it from the GH UI, in addition to from the bot), and updated it to fix the issue - it just wanted the incoming branch ref to be named origin/master instead of master.