git的入门学习推荐廖雪峰老师教程,包括基础的git概念,安装,github的相关操作等。
本文记录关联本地仓库与github学习过程中的总结与碰到的问题。
github是在线的基于Git的代码托管服务,目前众多开源项目托管在其上。个人只需要注册github帐号,就可以免费获取远程仓库。
设置ssh key
ssh的原理:https://blog.csdn.net/xiaoluoshan/article/details/78177217?locationNum=8&fps=1
为什么GitHub需要SSH Key呢?因为GitHub需要识别出你推送的提交确实是你推送的,而不是别人冒充的,而Git支持SSH协议,所以,GitHub只要知道了你的公钥,就可以确认只有你自己才能推送。
当然,GitHub允许你添加多个Key。假定你有若干电脑,你一会儿在公司提交,一会儿在家里提交,只要把每台电脑的Key都添加到GitHub,就可以在每台电脑上往GitHub推送了。
linux(mac)机器
执行以下命令(一路回车即可):
ssh-keygen -t rsa -C "XXXX@163.com"
在~/.ssh目录下,可以查看到生成以下两个文件:
- id_rsa.pub(公钥文件)
- id_rsa(私钥文件)
打开github的个人设置页面,拷贝id_rsa.pub文件的内容到SSH keys中。
windos机器
进入git bash界面,执行一下命令(同linux):
ssh-keygen -t rsa -C "XXXX@163.com"
windows的id_rsa.pub文件默认存储在用户的文档目录下,我的电脑存储在C:\Users\lei.ssh目录中。仅供参考,或者通过Everything工具查找。
找到id_rsa.pub后,拷贝其内容到个人的github。配置路径:settings —— SSH and GPG keys —— SSH keys —— New SSH key
关联本地仓库
git remote add origin https://github.com/yourname/learnGit.git
https协议关联git工程(origin为远程仓库别名),push操作前需要输入github帐号密码
git remote -v : 查看关联的仓库
- git remote rm origin : 删除远程仓库关联
git remote add origin git@github.com:yourname/learnGit.git
切换成ssh协议关联git工程,后续推送操作通过公钥免密操作。
git push -u origin master : push 推送本地仓库版本内容到远程仓库
Counting objects: 19, done. Delta compression using up to 4 threads. Compressing objects: 100% (19/19), done. Writing objects: 100% (19/19), 13.73 KiB, done. Total 23 (delta 6), reused 0 (delta 0) To git@github.com:michaelliao/learngit.git * [new branch] master -> master Branch master set up to track remote branch master from origin.
当你第一次使用Git的clone或者push命令连接GitHub时,会得到一个警告,输入yes即可。此操作将GitHub的Key添加到本机的一个信任列表里了。
The authenticity of host 'github.com (xx.xx.xx.xx)' can't be established. RSA key fingerprint is xx.xx.xx.xx.xx. Are you sure you want to continue connecting (yes/no)?
clone别人的工程到本地仓库
目的:通过逛论坛的方式,得到了一个开源的框架,想要下载到本地仓库学习并且修改后提交。
操作步骤:
1. 登录git hub。打开开源项目网页,选择右上角的Fork工程。
右上角有三个按钮: 1.想拷贝别人项目到自己帐号下就fork一下。 2.持续关注别人项目更新就star一下 3.watch是设置接收邮件提醒的。
- 打开git bash,进入本机准备存放代码的目录,clone即可
lei@lei-PC MINGW64 /f/gitcode
$ git clone git@github.com:yourname/learnGit.git
Cloning into 'learnGit'...
remote: Counting objects: 25, done.
remote: Compressing objects: 100% (15/15), done.
remote: Total 25 (delta 5), reused 25 (delta 5), pack-reused 0
Receiving objects: 100% (25/25), done.
Resolving deltas: 100% (5/5), done.
Checking connectivity... done.
lei@lei-PC MINGW64 /f/gitcode
$ ls
learnGit/
# 下载的工程代码不在当前目录,在项目目录中
lei@lei-PC MINGW64 /f/gitcode
$ git status
fatal: Not a git repository (or any of the parent directories): .git
lei@lei-PC MINGW64 /f/gitcode
$ cd learnGit/
lei@lei-PC MINGW64 /f/gitcode/learnGit (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
lei@lei-PC MINGW64 /f/gitcode/learnGit (master)
$ git branch
* master
默认clone下来的是master分支
如果需要clone分支代码,先确认已经存在master主干存在。
git checkout -b dev origin/dev
分支管理
- git checkout -b dev : 创建+切换分支
等价于
git branch dev (创建分支)
git checkout dev(切换分支) - git branch : 查看分支
*dev(表示当前所在分支)
master - git checkout master : 切换回主干
git merge dev : 合并分支到当前分支
默认采取Fast forward,删除分支后会丢失分支信息
- git merge –no-ff -m “merge with no-ff” dev
–no-ff 禁用Fast forward模式
本次合并要创建一个新的commit,所以加上-m参数,把commit描述写进去- git merge –no-ff -m “merge with no-ff” dev
git branch -d dev : 删除分支
- git branch -D dev : 未合并到主干的分支删除
lei@lei-PC MINGW64 /f/gitcode/learnGit (master) $ git branch -d dev error: The branch 'dev' is not fully merged. If you are sure you want to delete it, run 'git branch -D dev'. lei@lei-PC MINGW64 /f/gitcode/learnGit (master) $ git branch -D dev Deleted branch dev (was 1aa8025).
合并冲突
lei@lei-PC MINGW64 /f/gitcode/learnGit (master) $ git merge feature1 Auto-merging test.txt CONFLICT (content): Merge conflict in test.txt Automatic merge failed; fix conflicts and then commit the result.
查看工作空间状态
lei@lei-PC MINGW64 /f/gitcode/learnGit (master|MERGING) $ 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") Unmerged paths: (use "git add <file>..." to mark resolution) both modified: test.txt no changes added to commit (use "git add" and/or "git commit -a")
查看test.txt内容
lei@lei-PC MINGW64 /f/gitcode/learnGit (master|MERGING) $ cat test.txt # <<<<表示当前master的内容内容 <<<<<<< HEAD Create a new branch is quick & simple ======= Create a new branch is quick AND simple # >>>>表示分支feature1分支的内容 >>>>>>> feature1
需要修改test.txt的内容,保持主干分支一致后才可合并。具体以哪一段为准,具体问题具体分析。此处以分支内容为准。
lei@lei-PC MINGW64 /f/gitcode/learnGit (master|MERGING) $ echo 'Create a new branch is quick AND simple' > test.txt lei@lei-PC MINGW64 /f/gitcode/learnGit (master|MERGING) $ git add test.txt warning: LF will be replaced by CRLF in test.txt. The file will have its original line endings in your working directory. lei@lei-PC MINGW64 /f/gitcode/learnGit (master|MERGING) $ git commit -m 'test' [master 9d8d0ed] test lei@lei-PC MINGW64 /f/gitcode/learnGit (master) $ git merge feature1 Already up-to-date.
查看合并日志:
lei@lei-PC MINGW64 /f/gitcode/learnGit (master) $ git log --graph --pretty=oneline --abbrev-commit * 9d8d0ed test |\ | * 1c5ee73 modify test.txt * | 3499ed8 test.txt master modify |/ * 22bfa5a test.txt * abd25f5 tt * 064d9d1 delete stupid boss * 68cbd3c git of files * e00e689 git tracks changes * 7396c42 test * a233905 append GPL * 5c9c431 add distributed * aa412e5 add 3 files.
推送分支到远程仓库
将本地主干推送到仓库
lei@lei-PC MINGW64 /f/gitcode/learnGit (master) $ git push origin master Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (7/7), done. Writing objects: 100% (10/10), 903 bytes | 0 bytes/s, done. Total 10 (delta 3), reused 0 (delta 0) remote: Resolving deltas: 100% (3/3), done. To git@github.com:leila-wu/learnGit.git abd25f5..9d8d0ed master -> master
推送分支到远程仓库
将本地主干推送到仓库
lei@lei-PC MINGW64 /f/gitcode/learnGit (master) $ git push origin master Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (7/7), done. Writing objects: 100% (10/10), 903 bytes | 0 bytes/s, done. Total 10 (delta 3), reused 0 (delta 0) remote: Resolving deltas: 100% (3/3), done. To git@github.com:leila-wu/learnGit.git abd25f5..9d8d0ed master -> master
将本地分支推送到仓库
lei@lei-PC MINGW64 /f/gitcode/learnGit (dev) $ 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), 291 bytes | 0 bytes/s, done. Total 3 (delta 1), reused 0 (delta 0) remote: Resolving deltas: 100% (1/1), completed with 1 local object. To git@github.com:leila-wu/learnGit.git 9d8d0ed..1aa8025 dev -> dev
推送冲突
由于github可以支持多人同时维护,如果A与B同事修改了同样的文件,则需要先pull代码到本地,合并解决冲突后再次push