From 49ca0781ebc5e2b7883b236f560b8891c3d188a7 Mon Sep 17 00:00:00 2001
From: Stanley_233 <acc_stanley@foxmail.com>
Date: Wed, 24 Sep 2025 00:31:32 +0800
Subject: [PATCH] chore: add git lfs lock config

---
 .gitattributes |  2 +-
 README.md      | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 3e8f1d6..b1cf830 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-Content/** filter=lfs diff=lfs merge=lfs -text
+Content/** filter=lfs diff=lfs merge=lfs -text lockable
diff --git a/README.md b/README.md
index e0a0906..db86f4b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,20 @@
 # Voyager
 
 Developed with Unreal Engine 5
+
+## 冲突避免约定
+
+1. 在项目根目录输入如下命令，确保Push时检查服务器上的文件锁
+
+```bash
+git config lfs.http://62.234.216.156/Stanley/Voyager.git/info/lfs.locksverify true
+```
+
+2. 重要的蓝图/资产文件使用如下命令上锁，不解锁的话其他人在远端无法修改这个文件，避免冲突
+
+```bash
+git lfs lock Content/Blueprints/BP_MyCharacter.uasset # 后面改成要锁的文件的相对路径
+git lfs locks # 查看文件锁状态
+git lfs unlock Content/Blueprints/BP_MyCharacter.uasset # 解锁
+```
+