git merge 分支名称 (合并分支)git diff (查看冲突)git push -u origin master (推送到远程)git tag (查看当前标签)git tag -a 版本号(v1.0.0) -m “(注释)”git push origin tagName (把分支推送到远程上)