From c93bc4cc3eb15caec976d02cb53ff4a426bd43f4 Mon Sep 17 00:00:00 2001
From: dhy <1452562016@qq.com>
Date: Sat, 23 Nov 2024 15:38:08 +0800
Subject: [PATCH] study

---
 dhy.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dhy.txt b/dhy.txt
index e69de29..8108fd9 100644
--- a/dhy.txt
+++ b/dhy.txt
@@ -0,0 +1,3 @@
+git checkout dhy -- aaa.txt 强制合并dhy中的aaa.txt文件
+git diff dev dhy -- aaa.txt
+git branch里面有 master 没有dev 所以需要让本地dev和远程dev关联上：git branch --set-upstream-to=origin/dev dev 然后 再 git push
\ No newline at end of file