git再使用
D:\Work\Venus>git checkout like Switched to branch 'like'Your branch is up-to-date with 'origin/like'.
D:\Work\Venus>git merge master
Updating aff3162..dfedb14
Fast-forward
app.vue |3 +--
components/attrs/blankContent.vue | 20 ++++++++++++---
components/attrs/option.vue |4 +--
components/question.vue | 51 ++++++++++++++++++++++++++++++++++++---
components/tpls/base.vue | 16 +++---------
components/tpls/blank.vue |2 +-
components/tpls/choice.vue | 21 ++++++++++------
components/tpls/judge.vue | 15 +++---------
components/tpls/submit.vue | 27 +++++++++------------
components/ui/keybord.vue | 33 ++++++++++++-------------
components/ui/sidebar.vue |7 ++++--
controller/CallbackManager.js | 41 +++++++++++++++++++++++--------
css/question.scss | 11 +++++++--
index.js | 25 +++++++++++++++----
main.js |5 ++++
store/index.js | 17 ++++++-------
util/blankDeal.js | 20 ++++++++-------
17 files changed, 202 insertions(+), 116 deletions(-)
D:\Work\Venus>git status
On branch like
Your branch is ahead of 'origin/like' by 15 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
D:\Work\Venus>git push
Total 0 (delta 0), reused 0 (delta 0)
To ssh://gitlab.17zuoye.net:10022/neirongku/Venus.git
aff3162..dfedb14like -> like
页:
[1]