From 07b6c7274e13781cc3e36106a42b3d08fa16a145 Mon Sep 17 00:00:00 2001
From: Aaron Chen <wandoubaba517@gmail.com>
Date: Fri, 26 Nov 2021 09:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8git=E5=A4=84=E7=90=86=E9=87=8C?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E5=8F=A5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 git/常用git命令.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/常用git命令.md b/git/常用git命令.md
index cbde9a6..525e267 100644
--- a/git/常用git命令.md
+++ b/git/常用git命令.md
@@ -33,7 +33,7 @@ git checkout master
 git merge iss053
 # 合并后可以删iss053分支
 git branch -d iss053
-# 在iss053上做了一些修改
+# 如果合并时发现冲突，需要手动处理一下
 ```
 
 ## 代码推拉