一、配置和准备
1. 配置用户名和邮箱
$ git config --global user.name "Your Name"
$ git config --global user.email "youremail@example.com"
2. 生成 ssh key
$ ssh-keygen -t rsa -C "youremail@example.com"
3. 在平台(github、码云)账号上配置 ssh 公钥
将生成在 .ssh 文件夹里的 id_rsa.pub 内容粘贴进去即可。
二、创建新项目
1. 克隆/关联远程仓库
git clone git@github.com:SamsaraBlue/zhangmeng.git
git remote add origin git@github.com:SamsaraBlue/zhangmeng.git
2. 抓取分支
$ git clone git@github.com:SamsaraBlue/zhangmeng.git
Cloning into 'learngit'...
remote: Counting objects: 40, done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 40 (delta 14), reused 40 (delta 14), pack-reused 0
Receiving objects: 100% (40/40), done.
Resolving deltas: 100% (14/14), done.
$ git branch
* master
$ git checkout -b dev origin/dev
当远程仓库有新的更新信息没有同步到本地时,会抓取分支失败
//查看远程仓库信息
$ git remote show origin
//查看远程仓库更新信息
$ git remote update
//更新远程仓库的更新分支
$ git fetch
3. 提交到远程分支
$ git add env.txt
$ git commit -m "add env"
[dev 7a5e5dd] add env
1 file changed, 1 insertion(+)
create mode 100644 env.txt
$ git push origin dev
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 308 bytes | 308.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:SamsaraBlue/zhangmeng.git
f52c633..7a5e5dd dev -> dev
4. 解决冲突
$ cat env.txt
env
$ git add env.txt
$ git commit -m "add new env"
[dev 7bd91f1] add new env
1 file changed, 1 insertion(+)
create mode 100644 env.txt
此时执行从远程拉取到分支,或者合并分支。
//拉取
$ git pull
Auto-merging env.txt
CONFLICT (add/add): Merge conflict in env.txt
Automatic merge failed; fix conflicts and then commit the result.
//合并
$ git merge feature1
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.
出现冲突后,git status 查看冲突文件。
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: readme.txt
no changes added to commit (use "git add" and/or "git commit -a")
然后打开冲突文件,留下想要的修改。
Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1
留下想要的修改后,再保存,重新提交。
三、已存在项目
cd existing_repo
git remote -v // 查看当前远程仓库
git remote rm origin // 移除当前远程仓库
git remote add origin 远程仓库地址 // 更换当前远程仓库
git branch -M main
git push -uf origin main
四、分支策略
在实际开发中,我们应该按照几个基本原则进行分支管理:
1、master分支应该是非常稳定的,也就是仅用来发布新版本,平时不能在上面干活;
2、干活都在dev分支上,也就是说,dev分支是不稳定的,到某个时候,比如1.0版本发布时,再把dev分支合并到master上,在master分支发布1.0版本;
3、你和你的小伙伴们每个人都在dev分支上干活,每个人都有自己的分支,时不时地往dev分支上合并就可以了。
五、多人协作
-
master分支是主分支,因此要时刻与远程同步;
-
dev分支是开发分支,团队所有成员都需要在上面工作,所以也需要与远程同步;
-
bug分支只用于在本地修复bug,就没必要推到远程了,除非老板要看看你每周到底修复了几个bug;
-
feature分支是否推到远程,取决于你是否和你的小伙伴合作在上面开发。