Windows PowerShell
login
* rights
user
PS C:\Users\fan\Desktop\项目实战day1\code\vue_shop> git add .
PS C:\Users\fan\Desktop\项目实战day1\code\vue_shop> git commit -m "完成了权限功能的开
发"
[rights c5f4c24] 完成了权限功能的开发
6 files changed, 403 insertions(+), 10 deletions(-)
create mode 100644 src/components/power/Rights.vue
create mode 100644 src/components/power/Roles.vue
PS C:\Users\fan\Desktop\项目实战day1\code\vue_shop> git push
info: detecting host provider for 'https://gitee.com/'...
Enumerating objects: 26, done.
Counting objects: 100% (26/26), done.
Delta compression using up to 8 threads
Compressing objects: 100% (12/12), done.
Total 15 (delta 6), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.2]
To https://gitee.com/bai-xianger/vue_shop.git
a68f43b..c5f4c24 rights -> rights
PS C:\Users\fan\Desktop\项目实战day1\code\vue_shop> git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
//查看当前文件状态
git status
//提交文件到缓存区
git add .
//提交到码云
git commit -m “完成了权限功能的开发”
git push
//切换到master
git checkout master
PS C:\Users\fan\Desktop\项目实战day1\code\vue_shop> git merge rights
Updating a68f43b..c5f4c24
Fast-forward
src/assets/css/global.css | 1 +
src/components/power/Rights.vue | 60 ++++++++++
src/components/power/Roles.vue | 241 ++++++++++++++++++++++++++++++++++++++++
src/components/user/Users.vue | 94 ++++++++++++++--
src/plugins/element.js | 11 +-
src/router.js | 6 +-
6 files changed, 403 insertions(+), 10 deletions(-)
create mode 100644 src/components/power/Rights.vue
create mode 100644 src/components/power/Roles.vue
PS C:\Users\fan\Desktop\项目实战day1\code\vue_shop> git branch
login
* master
rights
user
PS C:\Users\fan\Desktop\项目实战day1\code\vue_shop> git push
info: detecting host provider for 'https://gitee.com/'...
info: detecting host provider for 'https://gitee.com/'...
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.2]
To https://gitee.com/bai-xianger/vue_shop.git
a68f43b..c5f4c24 master -> master
PS C:\Users\fan\Desktop\项目实战day1\code\vue_shop>
git merge rights
合并分支到master
git push
此时码云上的master数据更新完成