英语学习积累

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git pull

remote: Enumerating objects: 14, done.

remote: Counting objects: 100% (14/14), done.

remote: Compressing objects: 100% (7/7), done.

remote: Total 8 (delta 4), reused 0 (delta 0), pack-reused 0

Unpacking objects: 100% (8/8), 1.93 KiB | 123.00 KiB/s, done.

From http://192.168.143.226:8089/weiliu/reworkweb

   35583e2..397ac6d  master     -> origin/master

error: Your local changes to the following files would be overwritten by merge:

        src/router/index.js

Please commit your changes or stash them before you merge.

Aborting

Updating 35583e2..397ac6d

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git status

On branch master

Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.

  (use "git pull" to update your local branch)

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   src/components/home.vue

        modified:   src/router/index.js

        modified:   src/views/query/index.vue

Untracked files:

  (use "git add <file>..." to include in what will be committed)

        src/assets/images/auditfailed.png

        src/assets/images/reviewed.png

        src/views/query/myCard.vue

        src/views/query/sfIndex.vue

no changes added to commit (use "git add" and/or "git commit -a")

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git add src/*

warning: LF will be replaced by CRLF in src/components/home.vue.

The file will have its original line endings in your working directory

warning: LF will be replaced by CRLF in src/router/index.js.

The file will have its original line endings in your working directory

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git commit -m '查询页面'

[master d94e1b6] 鏌ヨ椤甸潰

 7 files changed, 846 insertions(+), 464 deletions(-)

 create mode 100644 src/assets/images/auditfailed.png

 create mode 100644 src/assets/images/reviewed.png

 rewrite src/components/home.vue (77%)

 rewrite src/views/query/index.vue (83%)

 create mode 100644 src/views/query/myCard.vue

 create mode 100644 src/views/query/sfIndex.vue

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git push

To http://192.168.143.226:8089/weiliu/reworkweb.git

 ! [rejected]        master -> master (non-fast-forward)

error: failed to push some refs to 'http://192.168.143.226:8089/weiliu/reworkweb.git'

hint: Updates were rejected because the tip of your current branch is behind

hint: its remote counterpart. Integrate the remote changes (e.g.

hint: 'git pull ...') before pushing again.

hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git pul

git: 'pul' is not a git command. See 'git --help'.

The most similar commands are

        pull

        push

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git pull

Auto-merging src/router/index.js

CONFLICT (content): Merge conflict in src/router/index.js

Automatic merge failed; fix conflicts and then commit the result.

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master|MERGING)

$ git pull

error: Pulling is not possible because you have unmerged files.

hint: Fix them up in the work tree, and then use 'git add/rm <file>'

hint: as appropriate to mark resolution and make a commit.

fatal: Exiting because of an unresolved conflict.

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master|MERGING)

$ git status

On branch master

Your branch and 'origin/master' have diverged,

and have 1 and 1 different commits each, respectively.

  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.

  (fix conflicts and run "git commit")

  (use "git merge --abort" to abort the merge)

Changes to be committed:

        modified:   src/main.js

        new file:   src/views/approval.vue

Unmerged paths:

  (use "git add <file>..." to mark resolution)

        both modified:   src/router/index.js

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master|MERGING)

$

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master|MERGING)

$ git add .

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master|MERGING)

$ git commit -m '解决路由冲突'

[master f65e83d] 瑙ｅ喅璺敱鍐茬獊

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git pull

Already up to date.

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$ git push

Enumerating objects: 44, done.

Counting objects: 100% (38/38), done.

Delta compression using up to 8 threads

Compressing objects: 100% (19/19), done.

Writing objects: 100% (22/22), 137.88 KiB | 13.79 MiB/s, done.

Total 22 (delta 10), reused 0 (delta 0), pack-reused 0

To http://192.168.143.226:8089/weiliu/reworkweb.git

   397ac6d..f65e83d  master -> master

Administrator@DESKTOP-O2ODP2G MINGW64 /e/code/reworkweb (master)

$