azurice/Voyager
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: add git lfs lock config

Browse Source
This commit is contained in:
Stanley_233
2025-09-24 00:31:32 +08:00
parent cf5cdeedcf
commit 49ca0781eb
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -1 +1 @@
Content/** filter=lfs diff=lfs merge=lfs -text
Content/** filter=lfs diff=lfs merge=lfs -text lockable

17
README.md
View File

@@ -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 # 解锁
```