chore: run terminal settlement repair #7

	name: Sync memory guard branch with current dev

	on:
	issue_comment:
	types: [created]

	permissions:
	contents: write
	issues: write

	jobs:
	sync:
	if: github.event.issue.number == 1 && github.event.comment.body == '/merge-memory-current-dev'
	runs-on: ubuntu-latest
	steps:
	- uses: actions/checkout@v4
	with:
	ref: fix/memory-guard-domain-scheduler
	fetch-depth: 0
	token: ${{ secrets.GITHUB_TOKEN }}

	- name: Merge current upstream dev
	id: merge
	continue-on-error: true
	shell: bash
	run: \|
	git config user.name "twoimo"
	git config user.email "32544727+twoimo@users.noreply.github.com"
	git remote add upstream https://github.com/Yeachan-Heo/gajae-code.git \|\| true
	git fetch --no-tags upstream dev
	if ! git merge --no-edit --no-ff upstream/dev; then
	git diff --name-only --diff-filter=U > /tmp/memory-conflicts.txt
	exit 1
	fi
	git push origin HEAD:fix/memory-guard-domain-scheduler

	- name: Report merge conflicts
	if: steps.merge.outcome == 'failure'
	uses: actions/github-script@v7
	with:
	script: \|
	const fs = require('fs');
	const paths = fs.existsSync('/tmp/memory-conflicts.txt')
	? fs.readFileSync('/tmp/memory-conflicts.txt', 'utf8').trim()
	: '(merge failed before conflict enumeration)';
	await github.rest.issues.createComment({
	owner: context.repo.owner,
	repo: context.repo.repo,
	issue_number: 1,
	body: `MEMORY_SYNC_FAILED\n\n${paths}`,
	});

	- name: Fail after report
	if: steps.merge.outcome == 'failure'
	run: exit 1

Navigation Menu