From 3125575610593315198d6370c9c6ad67e73fc06f Mon Sep 17 00:00:00 2001
From: taynpg <taynpg@163.com>
Date: Mon, 11 Nov 2024 09:35:49 +0800
Subject: [PATCH] =?UTF-8?q?git=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E8=BF=9C=E7=A8=8B=E4=BB=93=E5=BA=93=E5=92=8C=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E7=9A=84=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 git-use.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/git-use.txt b/git-use.txt
index cc01b05..a467978 100644
--- a/git-use.txt
+++ b/git-use.txt
@@ -3,6 +3,19 @@ git remote -v (查看)
 git remote remove origin (移除)
 git remote -v (确认)
 
+如果是推到新建的空仓库的话可以：
+git remote add origin https://www.sinxmiao.cn/taynpg/demo.git
+git push -u origin main
+
+如果是推到新建的仓库已有提交了的话：
+git remote set-url origin <新仓库的远程地址>
+git push origin master --force 其中master是远程分支。
+如果push到develop分支，落后master几个提交，
+就使用例如：git merge origin/develop
+处理冲突的话，git会在冲突的文件中，标识，手动处理文件后，
+git add添加提交即可。
+
+
 2.暂存本地修改，先获取服务器数据。
 git stash
 git stash show 查看是否暂存成功