Merge upstream branches #9623

	name: Merge upstream branches
	# Set permissions on GITHUB_TOKEN to allow updates to GitHub Actions workflows
	permissions: write-all
	on:
	schedule:
	# actually, ~5 minutes is the highest
	# effective frequency you will get
	- cron: '/20 * * *'
	jobs:
	merge:
	runs-on: ubuntu-latest
	steps:
	- uses: actions/checkout@v2
	- name: Merge upstream
	run: \|
	git config --global user.name 'NGAndersson'
	git config --global user.email '[email protected]'

	# "git checkout master" is unnecessary, already here by default
	git pull --unshallow # this option is very important, you would get
	# complains about unrelated histories without it.
	# (but actions/checkout@v2 can also be instructed
	# to fetch all git depth right from the start)

	git remote add upstream https://github.com/simulationcraft/simc.git
	git fetch upstream

	# Neither forget the -b opt,
	# the feature/x ref is ambiguous at this stage
	git checkout -b thewarwithin origin/thewarwithin
	git merge --no-edit upstream/thewarwithin
	git push origin thewarwithin

Provide feedback