build(deps): bump @liveblocks/client from 2.11.0 to 2.15.0 #516

	name: Lint and Format Check

	on:
	push:
	branches:
	- main
	pull_request:
	branches:
	- main

	jobs:
	lint-and-format:
	runs-on: ubuntu-latest

	steps:
	- name: Checkout code
	uses: actions/checkout@v4

	- name: Setup Bun
	uses: oven-sh/setup-bun@v2
	with:
	bun-version: latest

	- name: Install dependencies
	run: bun install

	- name: Run Prettier
	run: bun prettier --check .

	- name: Run ESLint
	run: bunx eslint .

	- name: Check for merge conflicts
	if: github.event_name == 'pull_request'
	run: \|
	git fetch --no-tags --prune origin +refs/heads/:refs/remotes/origin/
	git checkout -qf ${{ github.event.pull_request.head.sha }}
	git merge-base --is-ancestor origin/main ${{ github.event.pull_request.head.sha }} \|\| git merge --no-commit --no-ff origin/main
	if [ $? -ne 0 ]; then
	echo "Merge conflicts detected. Please resolve them before merging."
	exit 1
	fi

Provide feedback