git 解決衝突

時間 2019-12-25

標籤 git 解決衝突欄目 Git 简体版

原文原文鏈接

ZHANGSAN MINGW64 ~java

$ cd D:\Users\ZHANGSAN\git\DemoProjectServicegit

bash: cd: D:UsersZHANGSANgitDemoProjectService: No such file or directoryweb

ZHANGSAN MINGW64 ~bash

$ cd D:app

ZHANGSAN MINGW64 /ddom

$ cd Users/fetch

cdui

ZHANGSAN MINGW64 /d/Usersspa

$ cd ZHANGSAN/code

ZHANGSAN MINGW64 ~

$ cd git/DemoProjectService/

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ ll

total 8

drwxr-xr-x 1 ZHANGSAN 1049089 0 十月 8 16:22 config/

drwxr-xr-x 1 ZHANGSAN 1049089 0 十月 10 11:29 logs/

-rw-r--r-- 1 ZHANGSAN 1049089 7197 十月 8 16:22 pom.xml

drwxr-xr-x 1 ZHANGSAN 1049089 0 十月 8 16:22 src/

drwxr-xr-x 1 ZHANGSAN 1049089 0 十月 8 16:24 target/

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git status -s

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git pill

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

The most similar command is

pull

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git pull

Username for 'http://10.11.112.66': ZHANGSAN

From http://10.11.112.66/mario/DemoProjectService

* [new branch] opsLog -> origin/opsLog

Already up to date.

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git merge origin/opsLog

Merge made by the 'recursive' strategy.

src/main/java/com/pingan/wiseapm/web/AlertOpsLogController.java | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git status -s

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git status -s

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git status -s

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git pull

Username for 'http://10.11.112.66':

error: unable to read askpass response from 'C:/Program Files/Git/mingw64/libexec/git-core/git-gui--askpass'

Password for 'http://10.11.112.66':

fatal: Authentication failed for 'http://10.11.112.66/mario/DemoProjectService.git/'

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git pull origin/Opslog

fatal: 'origin/Opslog' does not appear to be a git repository

fatal: Could not read from remote repository.

Please make sure you have the correct access rights

and the repository exists.

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git pull origin/OpsLog

fatal: 'origin/OpsLog' does not appear to be a git repository

fatal: Could not read from remote repository.

Please make sure you have the correct access rights

and the repository exists.

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog)

$ git checkout -b 'OpsLog-gg'

Switched to a new branch 'OpsLog-gg'

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog-gg)

$ cd..

bash: cd..: command not found

ZHANGSAN MINGW64 ~/git/DemoProjectService (OpsLog-gg)

$ cd ..

ZHANGSAN MINGW64 ~/git

$ cd AppMonService/

ZHANGSAN MINGW64 ~/git/AppMonService (develop)

$ git checkout -b 'wangqing'

Switched to a new branch 'wangqing'

M logs/mario.log

ZHANGSAN MINGW64 ~/git/AppMonService (wangqing)

$ git push origin wangqing

Username for 'http://10.11.112.66': ZHANGSAN

Counting objects: 490, done.

Delta compression using up to 4 threads.

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

Writing objects: 100% (490/490), 43.81 KiB | 1.90 MiB/s, done.

Total 490 (delta 240), reused 394 (delta 170)

remote:

remote: =======================================================================

remote:

remote: 本套GIT將於2018-10-13

remote: t、權限）遷移到CODE平臺（http://code.paic.com.cn），遷移後再也不提供服務，若有問題請聯繫TANGJIE021。

remote:

remote: =======================================================================

To http://10.11.112.66/mario/AppMonService.git

* [new branch] wangqing -> wangqing

ZHANGSAN MINGW64 ~/git/AppMonService (wangqing)

$ cd ..

ZHANGSAN MINGW64 ~/git

$ cd DemoProjectService/

ZHANGSAN MINGW64 ~/git/DemoProjectService (develop)

$ git merge OpsLog-gg

Already up to date.

ZHANGSAN MINGW64 ~/git/DemoProjectService (develop)

$ git push origin develop

Username for 'http://10.11.112.66': ZHANGSAN

Counting objects: 14, done.

Delta compression using up to 4 threads.

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

Writing objects: 100% (14/14), 1.14 KiB | 193.00 KiB/s, done.

Total 14 (delta 7), reused 0 (delta 0)

remote:

remote: =======================================================================

remote:

remote: 本套GIT將於2018-10-13

remote: t、權限）遷移到CODE平臺（http://code.paic.com.cn），遷移後再也不提供服務，若有問題請聯繫TANGJIE021。

remote:

remote: =======================================================================

To http://10.11.112.66/mario/DemoProjectService.git

452a7ce..6e4945b develop -> develop

ZHANGSAN MINGW64 ~/git/DemoProjectService (develop)

$ cd ..

ZHANGSAN MINGW64 ~/git

$ cd MarioMongoService/

ZHANGSAN MINGW64 ~/git/MarioMongoService (metric)

$ git checkout develop

Switched to branch 'develop'

Your branch is behind 'origin/develop' by 17 commits, and can be fast-forwarded.

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

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git pull develop

fatal: 'develop' does not appear to be a git repository

fatal: Could not read from remote repository.

Please make sure you have the correct access rights

and the repository exists.

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git pull origin/develop

fatal: 'origin/develop' does not appear to be a git repository

fatal: Could not read from remote repository.

Please make sure you have the correct access rights

and the repository exists.

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git fetch

Username for 'http://10.11.112.66': ZHANGSAN

remote: Counting objects: 33, done.

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

remote: Total 33 (delta 16), reused 0 (delta 0)

Unpacking objects: 100% (33/33), done.

From http://10.11.112.66/mario/MarioMongoService

7eb72fd..ac8b36a develop -> origin/develop

efc7d41..5c8513a metric -> origin/metric

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git merge origin/develop

Updating 62c63ce..ac8b36a

Fast-forward

.../java/com/paic/mario/domain/SimpleEvent.java | 285 +++++++++++----------

.../java/com/paic/mario/service/IMongoService.java | 2 -

.../com/paic/mario/service/impl/MongoService.java | 2 -

.../com/paic/wiseapm/service/BusImpactService.java | 24 ++

.../com/paic/wiseapm/service/EventService.java | 11 +

.../wiseapm/service/impl/BusImpactServiceImpl.java | 198 ++++++++++++++

.../wiseapm/service/impl/EventServiceImpl.java | 166 ++++++++++++

.../com/paic/wiseapm/web/BusImpactController.java | 61 +++++

.../java/com/paic/wiseapm/web/EventController.java | 53 ++++

9 files changed, 660 insertions(+), 142 deletions(-)

create mode 100644 src/main/java/com/paic/wiseapm/service/BusImpactService.java

create mode 100644 src/main/java/com/paic/wiseapm/service/EventService.java

create mode 100644 src/main/java/com/paic/wiseapm/service/impl/BusImpactServiceImpl.java

create mode 100644 src/main/java/com/paic/wiseapm/service/impl/EventServiceImpl.java

create mode 100644 src/main/java/com/paic/wiseapm/web/BusImpactController.java

create mode 100644 src/main/java/com/paic/wiseapm/web/EventController.java

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git status

On branch develop

Your branch is up to date with 'origin/develop'.

nothing to commit, working tree clean

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git status -s

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git merge metric

Auto-merging src/main/java/com/paic/wiseapm/constant/Constants.java

CONFLICT (content): Merge conflict in src/main/java/com/paic/wiseapm/constant/Constants.java

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

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop|MERGING)

$ git status -s

M config/application.properties

UU src/main/java/com/paic/wiseapm/constant/Constants.java

A src/main/java/com/paic/wiseapm/model/AlertEvent.java

A src/main/java/com/paic/wiseapm/model/AlertInfo.java

A src/main/java/com/paic/wiseapm/model/AlertOpsLog.java

A src/main/java/com/paic/wiseapm/model/EventOps.java

A src/main/java/com/paic/wiseapm/model/EventShield.java

A src/main/java/com/paic/wiseapm/model/OpsLog.java

A src/main/java/com/paic/wiseapm/service/AlertOpsLogService.java

A src/main/java/com/paic/wiseapm/service/impl/AlertOpsLogServiceImpl.java

A src/main/java/com/paic/wiseapm/web/AlertOpsLogController.java

M src/main/resources/config/application.properties

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop|MERGING)

$ git status -s

M config/application.properties

UU src/main/java/com/paic/wiseapm/constant/Constants.java

A src/main/java/com/paic/wiseapm/model/AlertEvent.java

A src/main/java/com/paic/wiseapm/model/AlertInfo.java

A src/main/java/com/paic/wiseapm/model/AlertOpsLog.java

A src/main/java/com/paic/wiseapm/model/EventOps.java

A src/main/java/com/paic/wiseapm/model/EventShield.java

A src/main/java/com/paic/wiseapm/model/OpsLog.java

A src/main/java/com/paic/wiseapm/service/AlertOpsLogService.java

A src/main/java/com/paic/wiseapm/service/impl/AlertOpsLogServiceImpl.java

A src/main/java/com/paic/wiseapm/web/AlertOpsLogController.java

M src/main/resources/config/application.properties

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop|MERGING)

$ git add .

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop|MERGING)

$ git commit -m 'add'

[develop 465df0d] add

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git push origin develop

Username for 'http://10.11.112.66': ZHANGSAN

To http://10.11.112.66/mario/MarioMongoService.git

! [rejected] develop -> develop (fetch first)

error: failed to push some refs to 'http://10.11.112.66/mario/MarioMongoService.git'

hint: Updates were rejected because the remote contains work that you do

hint: not have locally. This is usually caused by another repository pushing

hint: to the same ref. You may want to first integrate the remote changes

hint: (e.g., 'git pull ...') before pushing again.

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

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git pull

Username for 'http://10.11.112.66': ZHANGSAN

remote: Counting objects: 35, done.

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

remote: Total 35 (delta 15), reused 0 (delta 0)

Unpacking objects: 100% (35/35), done.

From http://10.11.112.66/mario/MarioMongoService

ac8b36a..1b4dc6f develop -> origin/develop

Removing bin/src/main/java/com/paic/mario/web/MetricController.class

Removing bin/src/main/java/com/paic/mario/service/impl/MetricServiceImpl.class

Merge made by the 'recursive' strategy.

.../com/paic/mario/service/impl/MetricServiceImpl.class | Bin 6824 -> 0 bytes

.../main/java/com/paic/mario/web/MetricController.class | Bin 4892 -> 0 bytes

src/main/java/com/paic/mario/domain/SimpleEvent.java | 7 +++++++

.../com/paic/wiseapm/service/impl/EventServiceImpl.java | 5 ++++-

4 files changed, 11 insertions(+), 1 deletion(-)

delete mode 100644 bin/src/main/java/com/paic/mario/service/impl/MetricServiceImpl.class

delete mode 100644 bin/src/main/java/com/paic/mario/web/MetricController.class

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git fetch

Username for 'http://10.11.112.66': ZHANGSAN

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git status -s

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git push

Username for 'http://10.11.112.66':

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

$ git push origin develop

Username for 'http://10.11.112.66': ZHANGSAN

Counting objects: 23, done.

Delta compression using up to 4 threads.

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

Writing objects: 100% (23/23), 1.79 KiB | 229.00 KiB/s, done.

Total 23 (delta 11), reused 0 (delta 0)

remote:

remote: =======================================================================

remote:

remote: 本套GIT將於2018-10-13

remote: t、權限）遷移到CODE平臺（http://code.paic.com.cn），遷移後再也不提供服務，若有問題請聯繫TANGJIE021。

remote:

remote: =======================================================================

To http://10.11.112.66/mario/MarioMongoService.git

1b4dc6f..0eacbe0 develop -> develop

ZHANGSAN MINGW64 ~/git/MarioMongoService (develop)

ZHANGSAN MINGW64 ~

$ cd d:

ZHANGSAN MINGW64 /d

$ cd users/

ZHANGSAN MINGW64 /d/users

$ cd ZHANGSAN/

ZHANGSAN MINGW64 /d/users/ZHANGSAN

$ cd git

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git

$ cd wiseApmService

bash: cd: wiseApmService: No such file or directory

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git

$ cd DemoProjectService/

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git pull origin develop

Username for 'http://10.11.112.66': zhangsan

From http://10.11.112.66/mario/DemoProjectService

* branch develop -> FETCH_HEAD

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

src/main/java/com/pingan/wiseapm/client/MongoClient.java

Please commit your changes or stash them before you merge.

Aborting

Updating 8661914..f4f6db9

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git merge develop

Already up to date.

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git status -s

M logs/mario.log

M src/main/java/com/pingan/wiseapm/client/MongoClient.java

M src/main/java/com/pingan/wiseapm/model/AlertOpsLog.java

M src/main/java/com/pingan/wiseapm/model/OpsLog.java

M src/main/java/com/pingan/wiseapm/web/AlertOpsLogController.java

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git add .

warning: LF will be replaced by CRLF in src/main/java/com/pingan/wiseapm/model/O psLog.java.

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

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git commit

Aborting commit due to empty commit message.

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git fetch

Username for 'http://10.11.112.66': zhangsan

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git status -s

M logs/mario.log

M src/main/java/com/pingan/wiseapm/client/MongoClient.java

M src/main/java/com/pingan/wiseapm/model/AlertOpsLog.java

M src/main/java/com/pingan/wiseapm/model/OpsLog.java

M src/main/java/com/pingan/wiseapm/web/AlertOpsLogController.java

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git commit -m 'changes'

[develop f8b40af] changes

5 files changed, 722 insertions(+), 9 deletions(-)

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ git pull

Username for 'http://10.11.112.66': zhangsan

Auto-merging src/main/java/com/pingan/wiseapm/client/MongoClient.java

CONFLICT (content): Merge conflict in src/main/java/com/pingan/wiseapm/client/Mo ngoClient.java

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

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop|MERGING)

$ git status -s

UU src/main/java/com/pingan/wiseapm/client/MongoClient.java

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop|MERGING)

$ git add.

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

The most similar command is

add

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop|MERGING)

$ git add .

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop|MERGING)

$ git commit

[develop 1f7d5f6] Merge branch 'develop' of http://10.11.112.66/mario/WiseApmAle rtService into develop

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProject Service (develop)

$ ^C

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProjectService (develop)

$ Aborting commit due to empty commit message.

bash: Aborting: command not found

ZHANGSAN MINGW64 /d/users/ZHANGSAN/git/DemoProjectService (develop)

相關標籤/搜索

每日一句

每一个你不满意的现在，都有一个你没有努力的曾经。