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

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

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