Merge pull request #137 from team-ppointer/develop #42

	name: moplus-server
	on:
	push:
	branches: master

	jobs:
	deploy:
	runs-on: ubuntu-latest
	steps:
	- name: Deploy spring MainServer(main)
	uses: appleboy/ssh-action@master
	with:
	host: ${{ secrets.SERVER_HOST_PROD }}
	username: ${{ secrets.SERVER_USERNAME_PROD }}
	key: ${{ secrets.SERVER_KEY_PROD}}
	script: \|
	cd ~/pointer_server
	kill -9 $(lsof -t -i :8080)
	git checkout master
	git add .
	git commit -m "temp commit"
	git fetch origin master
	git merge origin/master
	if [ $? -ne 0 ]; then # 병합 명령어의 종료 상태를 확인합니다.
	echo "Merge conflict detected. Resolving by applying remote changes."
	git checkout --theirs $(git diff --name-only --diff-filter=U) # 충돌이 발생한 파일에 원격 변경 사항을 적용합니다.
	git add . # 충돌이 해결된 파일을 스테이징합니다.
	git commit -m "Resolved merge conflicts by applying remote changes." # 커밋 메시지를 작성하여 충돌 해결을 커밋합니다.
	else
	echo "Merge successful, no conflicts detected."
	fi

	./gradlew clean build
	docker rm -f pointer-server-prod --force
	docker rmi pointer-server-prod
	docker compose -f docker-compose-prod.yml -p pointer-prod up --build -d

Provide feedback