Ubuntu中在终端使用git将代码上传GitHub实现过程

pj@pj:$ git config --global user.name "Pj"
pj@pj:$ git config --global user.email "xxx@qq.com"

pj@pj:$ gedit ~/.ssh/id_rsa.pub 	# 公匙
pj@pj:$ gedit ~/.ssh/id_rsa		# 私匙，不需提交

git init		# 初始化一个新的Git仓库

git add ./		# 把文件添加到暂存区

git status

git commit -m "提交项目相关信息"	# 把暂存区内容提交到本地仓库

git remote add origin git@github.com:pj66666/NeuroSLAM.git
# 添加远程仓库地址，如果显示fatal: 远程 origin 已经存在。那么先删除本地仓库和远程仓库的连接，再进行连接
git remote rm origin
git remote add origin git@github.com:pj66666/NeuroSLAM_C-.git

git remote set-url origin git@github.com:pj66666/NeuroSLAM_C-.git

git push -u origin master	# git push <远程仓库名> <远程分支名> 这里origin是默认远程仓库别名，master是分支名

git tag -a v1.0 -m "Version 1.0"		# 创建一个标签，1.0版本
git push origin v1.0		# 	将刚刚创建的标签推送到远程仓库   命令格式	git push origin <版本号>		

git tag -a v1.1 -m "version 1.1"
git push origin v1.1

git checkout -b <新分支名>   # 在仓库创建一个新的分支
git push origin <新分支名>	# 其余同理

To github.com:pj66666/RF2o_detailed_comment.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'git@github.com:pj66666/RF2o_detailed_comment.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.

git pull origin master --allow-unrelated-histories 
git status
git add .
git commit -m "Merge remote-tracking branch 'origin/master'"
git push origin master 

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

git commit -m “Complete merge”

git merge --abort

git push origin master