$ git push origin name
Everything up-to-date
查到的解决办法:创建一个新分支push后合并到想push的分支
先创建一个新的分支 git branch dev1
git branch 检查是否创建成功
$ git branch
dev1
* master
name
有dev1证明创建成功
git checkout dev1切换到创建的分支
$ git checkout dev1
Switched to branch 'dev1'
M fileA.txt
M fileB.txt
然后再提交并推送
$ git commit -m "添加简介"
On branch dev1
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: fileA.txt
modified: fileB.txt
no changes added to commit (use "git add" and/or "git commit -a")
推送到远程仓库
$ git push origin dev1
Enumerating objects: 23, done.
Counting objects: 100% (23/23), done.
Delta compression using up to 12 threads
Compressing objects: 100% (21/21), done.
Writing objects: 100% (22/22), 2.05 KiB | 419.00 KiB/s, done.
Total 22 (delta 11), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.4]
remote: Create a pull request for 'dev1' on Gitee by visiting:
remote: https://gitee.com/gukl123/tt-1/pull/new/gukl123:dev1...gukl123:master
To gitee.com:gukl123/tt-1.git
* [new branch] dev1 -> dev1
然后再$ git checkout name切换回来分支准备合并如果出现提示
强制切换回来
$ git checkout -f name
warning: unable to rmdir 'tt-1': Directory not empty
Switched to branch 'name'
把新分支的东西合并进来
$ git merge dev1
Updating f669c2f..778d0f0
Fast-forward
fileA.txt | 3 +++
fileB.txt | 7 +++++++
fileC.txt | 8 ++++++++
tt-1 | 1 +
4 files changed, 19 insertions(+)
create mode 100644 fileA.txt
create mode 100644 fileB.txt
create mode 100644 fileC.txt
create mode 160000 tt-1
git删除分支:
删除本地分支 git branch -d 本地分支名
删除远程分支 git push origin --delete 远程分支名
推送空分支到远程(删除远程分支另一种实现)git push origin :远程分支
git查看分支:
查看本地分支 git branch
查看远程分支 git branch -r
查看本地和远程分支 git branch -a