Merge dev into main #24

	name: Merge dev into main

	on:
	workflow_dispatch:
	workflow_call:

	jobs:
	merge-branch:
	runs-on: ubuntu-latest

	steps:
	- name: Checkout
	uses: actions/checkout@v2
	with:
	ref: main
	- name: Set Git config
	run: \|
	git config --local user.email "[email protected]"
	git config --local user.name "Github Actions"
	- name: Merge dev to main
	run: \|
	git pull
	git merge --no-ff --allow-unrelated-histories -X theirs origin/dev -m "[Automated] Merged dev into main"
	- name: Use CHANGELOG and package.json from main
	run: \|
	git checkout HEAD~1 CHANGELOG.md
	git checkout HEAD~1 package.json
	git commit --amend --no-edit
	- name: Push
	run: \|
	git push

Provide feedback