From 733b90dfde9314e56a2cd85f7073f527a30d6718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E8=A7=85?= <jafar0110@foxmail.com>
Date: Tue, 25 Aug 2026 16:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md      | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 docs/README.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 README.md
 create mode 100644 docs/README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..95b6809
--- /dev/null
+++ b/README.md
@@ -0,0 +1,56 @@
+# Git初始化设置
+
+### 关联线上仓库并拉取
+
+```bash
+# 初始化git（已初始化可跳过）
+git init
+
+# 关联远程仓库地址
+git remote add origin https://gitea.if.fyi/jafar.o.jeh/hx2project.git
+
+# 拉取远程代码（允许无关历史，本地代码保留）
+git pull origin main --allow-unrelated-histories
+# 拉取远程main分支，冲突全部保留远程、丢弃本地改动
+git pull -s theirs origin main
+
+# 所有冲突文件，直接取本地版本
+git checkout --ours .
+# 所有冲突文件，直接取远程版本
+git checkout --theirs .
+
+# 重置本地分支完全和远程一致，本地所有修改清空
+git reset --hard origin/main
+
+# 提交推送
+git add .
+git commit -m "合并远程，本地文件全部覆盖"
+git push origin main -f
+```
+
+### dev 同步到 main分支
+
+```bash
+git checkout main
+git merge dev
+git add .
+git commit -m "更新内容"
+git push origin main
+```
+
+### 强制覆盖本地
+
+```bash
+git fetch --all
+git reset --hard origin/main
+git pull origin main
+```
+
+### 发布release
+
+```bash
+git checkout -b release/v0.0.1
+git tag -a v0.0.1 -m "Release v0.0.1"
+git push origin release/v0.0.1
+git push origin v0.0.1
+```
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000..95b6809
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,56 @@
+# Git初始化设置
+
+### 关联线上仓库并拉取
+
+```bash
+# 初始化git（已初始化可跳过）
+git init
+
+# 关联远程仓库地址
+git remote add origin https://gitea.if.fyi/jafar.o.jeh/hx2project.git
+
+# 拉取远程代码（允许无关历史，本地代码保留）
+git pull origin main --allow-unrelated-histories
+# 拉取远程main分支，冲突全部保留远程、丢弃本地改动
+git pull -s theirs origin main
+
+# 所有冲突文件，直接取本地版本
+git checkout --ours .
+# 所有冲突文件，直接取远程版本
+git checkout --theirs .
+
+# 重置本地分支完全和远程一致，本地所有修改清空
+git reset --hard origin/main
+
+# 提交推送
+git add .
+git commit -m "合并远程，本地文件全部覆盖"
+git push origin main -f
+```
+
+### dev 同步到 main分支
+
+```bash
+git checkout main
+git merge dev
+git add .
+git commit -m "更新内容"
+git push origin main
+```
+
+### 强制覆盖本地
+
+```bash
+git fetch --all
+git reset --hard origin/main
+git pull origin main
+```
+
+### 发布release
+
+```bash
+git checkout -b release/v0.0.1
+git tag -a v0.0.1 -m "Release v0.0.1"
+git push origin release/v0.0.1
+git push origin v0.0.1
+```