花生壳做的网站稳定吗,建筑网站模板,手机网站设计字体大小,网站升级中 模版前言
那么这里博主先安利一些干货满满的专栏了#xff01;
首先是博主的高质量博客的汇总#xff0c;这个专栏里面的博客#xff0c;都是博主最最用心写的一部分#xff0c;干货满满#xff0c;希望对大家有帮助。
高质量博客汇总
然后就是博主最近最花时间的一个专栏…前言
那么这里博主先安利一些干货满满的专栏了
首先是博主的高质量博客的汇总这个专栏里面的博客都是博主最最用心写的一部分干货满满希望对大家有帮助。
高质量博客汇总
然后就是博主最近最花时间的一个专栏《Git企业开发控制理论和实操》希望大家多多关注
Git企业开发控制理论和实操 多人协作开发
学习案例一
案例说明
目标在远端仓库中master分支下的file.txt文件新增两行代码aaa和bbb。 实现由开发者一新增aaa由开发者二新增bbb。 条件在一个分支下协作完成。
准备工作
当然我们说过远端的master分支一定是一个稳定的分支不能用于开发。所以现在先在远端创建一个dev分支。 当然现在本地云服务器看不到远端的dev分支所以先pull一下。
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git pull
From gitee.com:Yufch/remote-gitcode* [new branch] dev - origin/dev
Already up-to-date.
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ 现在本地就有远程的dev分支了。
注意要区分本地的dev分支和本地所知道的远程的dev分支。 本地的master分支叫做master 远端的master在本地叫做origin/master 远端的dev在本地叫做origin/dev
都是不一样的。
git branch -a # 可以查看本地的所有分支包括本地的和远端的(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git branch -a
* masterremotes/origin/HEAD - origin/masterremotes/origin/devremotes/origin/master
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$然后上面把我的阿里云服务器上的仓库准备好了我们再准备一个本地maxOS本地的一个remote仓库。
(base) [demacYuMacBook-Air:Git企业开发精品课程]$ git clone https://gitee.com/Yufch/remote-gitcode.git
Cloning into remote-gitcode...
remote: Enumerating objects: 17, done.
remote: Counting objects: 100% (17/17), done.
remote: Compressing objects: 100% (15/15), done.
remote: Total 17 (delta 3), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (17/17), 4.55 KiB | 4.55 MiB/s, done.
Resolving deltas: 100% (3/3), done.
(base) [demacYuMacBook-Air:Git企业开发精品课程]$开始开发
让协作者一完成aaa的更新协作者二完成bbb的更新。
首先是开发者一
看一下这行命令。
git checkout -b dev origin/dev这行命令完成了三件事。
在本地创建了一个dev分支切到dev分支下让本地的dev分支和远程的origin/dev分支建立了一个连接
如何查看这个连接呢
git branch -vv(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git branch -vv
* dev 7393ea0 [origin/dev] add .gitignoremaster 7393ea0 [origin/master] add .gitignore
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$新增一行aaa。 然后addcommitpush到远程的dev分支中。
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git add .
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git commit -m md file.txt: aaa
[dev 7c49864] md file.txt: aaa1 file changed, 2 insertions(), 1 deletion(-)
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git status
# On branch dev
# Your branch is ahead of origin/dev by 1 commit.
# (use git push to publish your local commits)
#
nothing to commit, working directory clean
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git push
warning: push.default is unset; its implicit value is changing in
Git 2.0 from matching to simple. To squelch this message
and maintain the current behavior after the default changes, use:git config --global push.default matchingTo squelch this message and adopt the new behavior now, use:git config --global push.default simpleSee git help config and search for push.default for further information.
(the simple mode was introduced in Git 1.7.11. Use the similar mode
current instead of simple if you sometimes use older versions of Git)Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 273 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Powered by GITEE.COM [GNK-6.4]
To gitgitee.com:Yufch/remote-gitcode.git7393ea0..7c49864 dev - dev
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$然后是开发者二
(base) [demacYuMacBook-Air:remote-gitcode]$ ls
README.en.md README.md file.txt
(base) [demacYuMacBook-Air:remote-gitcode]$ git branch
* master
(base) [demacYuMacBook-Air:remote-gitcode]$ git checkout -b dev origin/dev
M file.txt
branch dev set up to track origin/dev.
Switched to a new branch dev
(base) [demacYuMacBook-Air:remote-gitcode]$ git add .
(base) [demacYuMacBook-Air:remote-gitcode]$ git commit -m md file.txt: bbb
[dev 220f739] md file.txt: bbbCommitter: 的mac demacYuMacBook-Air.local
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:git config --global user.name Your Namegit config --global user.email youexample.comAfter doing this, you may fix the identity used for this commit with:git commit --amend --reset-author1 file changed, 2 insertions(), 1 deletion(-)
(base) [demacYuMacBook-Air:remote-gitcode]$ git push
To https://gitee.com/Yufch/remote-gitcode.git! [rejected] dev - dev (fetch first)
error: failed to push some refs to https://gitee.com/Yufch/remote-gitcode.git
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., git pull ...) before pushing again.
hint: See the Note about fast-forwards in git push --help for details.
(base) [demacYuMacBook-Air:remote-gitcode]$我们发现git拒绝了我们的推送。
这是因为远程的dev分支下现在是有一行aaa的而如果我们推送就会冲突
所以我们要先使用git pull把远程的东西先拉下来。 (base) [demacYuMacBook-Air:remote-gitcode]$ git pull
Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt
error: could not apply 220f739... md file.txt: bbb
hint: Resolve all conflicts manually, mark them as resolved with
hint: git add/rm conflicted_files, then run git rebase --continue.
hint: You can instead skip this commit: run git rebase --skip.
hint: To abort and get back to the state before git rebase, run git rebase --abort.
Could not apply 220f739... md file.txt: bbb
(base) [demacYuMacBook-Air:remote-gitcode]$ git add .
(base) [demacYuMacBook-Air:remote-gitcode]$ git commit -m merge
[detached HEAD a37671a] mergeCommitter: 的mac demacYuMacBook-Air.local
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:git config --global user.name Your Namegit config --global user.email youexample.comAfter doing this, you may fix the identity used for this commit with:git commit --amend --reset-author1 file changed, 2 insertions(), 1 deletion(-)
(base) [demacYuMacBook-Air:remote-gitcode]$ git push
fatal: You are not currently on a branch.
To push the history leading to the current (detached HEAD)
state now, usegit push origin HEAD:name-of-remote-branch(base) [demacYuMacBook-Air:remote-gitcode]$ git push origin HEAD:dev
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 292 bytes | 292.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.4]
To https://gitee.com/Yufch/remote-gitcode.git7c49864..a37671a HEAD - dev
(base) [demacYuMacBook-Air:remote-gitcode]$ 这样就可以了。 将origin/dev合并到origin/master中
PR方式
现在master分支是没有后面两行代码的。 要用pull request 提交PR之后开发人员要做的事情就已经做完了。
审查人员通过看这个PR单子文件改动这些信息可以选择通过PR或拒绝PR。 本地合并dev再将本地master推送到origin/master上
学习案例二
案例说明
目标远程master分支下新增funciton1和function2文件
实现由开发者1新增function1开发者2新增function2
条件在不同分支下协作完成各自私有一个分支
开始开发
开发者一
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git branch -a
* devmasterremotes/origin/HEAD - origin/masterremotes/origin/devremotes/origin/master
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git checkout -b feature-1
Switched to a new branch feature-1
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ vim function-1
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git add .
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git commit -m add function-1
[feature-1 a34d9d6] add function-11 file changed, 2 insertions()create mode 100644 function-1
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git push origin feature-1
Counting objects: 16, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (15/15), 1.93 KiB | 0 bytes/s, done.
Total 15 (delta 4), reused 0 (delta 0)
remote: Powered by GITEE.COM [GNK-6.4]
remote: Create a pull request for feature-1 on Gitee by visiting:
remote: https://gitee.com/Yufch/remote-gitcode/pull/new/Yufch:feature-1...Yufch:master
To gitgitee.com:Yufch/remote-gitcode.git* [new branch] feature-1 - feature-1
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$新增了一个function-1文件然后直接推送到远程远程就会多一个feature-1分支。 开发者二
(base) [demacYuMacBook-Air:remote-gitcode]$ cat file.txt
hello gitee
hello world
aaa
bbb
(base) [demacYuMacBook-Air:remote-gitcode]$ ls
README.en.md README.md file.txt
(base) [demacYuMacBook-Air:remote-gitcode]$ git checkout -b feature-2
Switched to a new branch feature-2
(base) [demacYuMacBook-Air:remote-gitcode]$ touch function-2
(base) [demacYuMacBook-Air:remote-gitcode]$ vim function-2
(base) [demacYuMacBook-Air:remote-gitcode]$ cat function-2 n
I am coding ...
Done!
cat: n: No such file or directory
(base) [demacYuMacBook-Air:remote-gitcode]$ cat function-2
I am coding ...
Done!
(base) [demacYuMacBook-Air:remote-gitcode]$ git add .
(base) [demacYuMacBook-Air:remote-gitcode]$ git commit -m add function-2
[feature-2 2a63bd0] add function-2Committer: 的mac demacYuMacBook-Air.local
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:git config --global user.name Your Namegit config --global user.email youexample.comAfter doing this, you may fix the identity used for this commit with:git commit --amend --reset-author1 file changed, 2 insertions()create mode 100644 function-2
(base) [demacYuMacBook-Air:remote-gitcode]$ git push origin feature-2
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 311 bytes | 311.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.4]
remote: Create a pull request for feature-2 on Gitee by visiting:
remote: https://gitee.com/Yufch/remote-gitcode/pull/new/Yufch:feature-2...Yufch:master
To https://gitee.com/Yufch/remote-gitcode.git* [new branch] feature-2 - feature-2
(base) [demacYuMacBook-Air:remote-gitcode]$此时目前到这里我们没有发生任何冲突
这是因为他们是私有一个分支的所以没有冲突。
但天有不测风云你的小伙伴突然生病了但需求还没开发完需要你帮他继续开发于是他便把feature-2 分支名告诉你了。这时你就需要在自己的机器上切换到 feature-2 分支帮忙继续开发。
这就回到了多名开发者在一个机器上开发的情况了。
那么对于开发者一来说我首先需要获得feature-2这个分支。
先pull下来。
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git pull
remote: Enumerating objects: 11, done.
remote: Counting objects: 100% (11/11), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 7 (delta 2), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (7/7), done.
From gitee.com:Yufch/remote-gitcode* [new branch] feature-2 - origin/feature-27393ea0..ef7fda4 master - origin/master
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for detailsgit pull remote branchIf you wish to set tracking information for this branch you can do so with:git branch --set-upstream-toorigin/branch feature-1(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git branch -adev
* feature-1masterremotes/origin/HEAD - origin/masterremotes/origin/devremotes/origin/feature-1remotes/origin/feature-2remotes/origin/master
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$虽然直接git pull会报错但是我们看到确实origin/feature-2分支能被本地看到了。
这是为什么
git pull
拉取分支内的内容一定要建立连接后才能使用短的git pull命令拉取仓库内容可以直接拉不需要分支建立连接因为和分支本来就没关系
此时我们就要在本地创建一个feature-2分支并和远程的origin/feature-2分支建立联系。·
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git checkout -b feature-2 origin/feature-2
Branch feature-2 set up to track remote branch feature-2 from origin.
Switched to a new branch feature-2
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git branchdevfeature-1
* feature-2master
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ (base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ vim function-2
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git add .
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git commit -m md function2 by 1
[feature-2 280238d] md function2 by 11 file changed, 2 insertions()
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git push
warning: push.default is unset; its implicit value is changing in
Git 2.0 from matching to simple. To squelch this message
and maintain the current behavior after the default changes, use:git config --global push.default matchingTo squelch this message and adopt the new behavior now, use:git config --global push.default simpleSee git help config and search for push.default for further information.
(the simple mode was introduced in Git 1.7.11. Use the similar mode
current instead of simple if you sometimes use older versions of Git)Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 305 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Powered by GITEE.COM [GNK-6.4]
To gitgitee.com:Yufch/remote-gitcode.git2a63bd0..280238d feature-2 - feature-2! [rejected] master - master (non-fast-forward)
error: failed to push some refs to gitgitee.com:Yufch/remote-gitcode.git
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. If you did not intend to push that branch, you may want to
hint: specify branches to push or set the push.default configuration variable
hint: to simple, current or upstream to push only the current branch.
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$此时远程就有了开发者一为开发者二写的内容了。
当然如果此时开发者二说自己病好了那么他想继续开发。
此时的开发者二是看不到开发者一新增的内容了所以pull一下即可。
开发者二
(base) [demacYuMacBook-Air:remote-gitcode]$ ls
README.en.md README.md file.txt function-2
(base) [demacYuMacBook-Air:remote-gitcode]$ # 先建立连接
(base) [demacYuMacBook-Air:remote-gitcode]$ git branch --set-upstream-toorigin/feature-2 feature-2
branch feature-2 set up to track origin/feature-2.
(base) [demacYuMacBook-Air:remote-gitcode]$ git branch -vvdev 220f739 [origin/dev: ahead 1, behind 2] md file.txt: bbb
* feature-2 2a63bd0 [origin/feature-2] add function-2master ef7fda4 [origin/master] !1 dev请求合并到master Merge pull request !1 from Yufc/dev
(base) [demacYuMacBook-Air:remote-gitcode]$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 285 bytes | 95.00 KiB/s, done.
From https://gitee.com/Yufch/remote-gitcode2a63bd0..280238d feature-2 - origin/feature-2
Updating 2a63bd0..280238d
Fast-forwardfunction-2 | 2 1 file changed, 2 insertions()
(base) [demacYuMacBook-Air:remote-gitcode]$ 开发好之后push上去就行了。
origin/feature-2和origin/feature-1合并到origin/master上去
这里我们用PR的方式。 最后把feature-2也提交一份PR。
然后就等审查人员通过PR即可。 当然按照之前的建议我们其实不能像上面那样去合并。
要先让feature-2去合并master如果有bug也不会影响master大家可以参考之前的章节。
解决git branch -a显示已经被删除的远程分支的方法
就是开发完成之后远程删除feature-1和feature-2这两个分支了。
但是git branch -a在本地还是能够显示feature-1和feature-2这两个分支这是不好的。 git remote show origin这个命令可以看到远程的一些信息。
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git remote show origin
* remote originFetch URL: gitgitee.com:Yufch/remote-gitcode.gitPush URL: gitgitee.com:Yufch/remote-gitcode.gitHEAD branch: masterRemote branches:feature-1 trackedfeature-2 trackedmaster trackedrefs/remotes/origin/dev stale (use git remote prune to remove) # 他这里会建议我们去删除这些分支Local branches configured for git pull:dev merges with remote devfeature-2 merges with remote feature-2master merges with remote masterLocal refs configured for git push:feature-1 pushes to feature-1 (up to date)feature-2 pushes to feature-2 (local out of date)master pushes to master (local out of date)
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git remote prune origin # 这个命令可以去修剪一些已经被删除的分支(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$ git remote prune origin
Pruning origin
URL: gitgitee.com:Yufch/remote-gitcode.git* [pruned] origin/dev
(base) [yufcALiCentos7:~/Src/Bit-Courses/GitDevelopment/remote-gitcode]$这里显示已经帮我们删除了dev分支了。
