git status
On branch test t-forwarded.
Your branch is behind 'origin/test' by 13 commits, and can be fast
-forwarded.
(use "git pull" to update your local branch)
ctory)
Changes not staged for commit:
On branch test
Your branch is behind 'origin/test' by 13 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: package.json
deleted: src/views/drugstore/drugstoreList.vue
modified: src/views/drugstore/drugstoreListPop.vue
modified: src/views/institutionalManage/serviceDetails/serviceDetails2.vue
modified: src/views/institutionalManage/serviceDetails/serviceDetails3.vue
modified: src/views/institutionalManage/serviceQuery/serviceQuery2.vue
modified: src/views/institutionalManage/serviceQuery/serviceQuery3.vue
modified: src/views/settledIn/brandManage.vue
modified: vue.config.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/views/institutionalManage/serviceQuery/SupplierSelectDialog.vue
no changes added to commit (use "git add" and/or "git commit -a")
解决：使用git stash缓存本地或者直接删掉当前本地的东西，在merge，再push