Merge pull request #696 from basetenlabs/bump-version-0.7.11 #26

	name: Merge release into main

	on:
	workflow_dispatch:
	push:
	branches:
	- release

	jobs:
	merge-to-main:
	runs-on: ubuntu-latest

	steps:
	- name: Check out code
	uses: actions/checkout@v3
	with:
	token: ${{ secrets.BASETENBOT_GITHUB_TOKEN }}

	- name: Configure Git user as basetenbot
	run: \|
	git config user.name "basetenbot"
	git config user.email "96544894+basetenbot@users.noreply.github.com"

	- name: Fetch all branches
	run: \|
	git fetch --all --unshallow
	git checkout release
	git pull origin release

	- name: Merge release into main with priority on main changes
	run: \|
	git checkout main
	git merge --strategy-option=ours release
	git push origin main
	env:
	GH_TOKEN: ${{ secrets.BASETENBOT_GITHUB_TOKEN }}

Provide feedback