解决git merge的冲突问题

bantinghy

已于 2023-07-21 09:52:59 修改

阅读量645

点赞数

分类专栏： Git 文章标签： git linux 服务器

于 2023-07-21 09:45:52 首次发布

本文链接：https://blog.csdn.net/u011743621/article/details/131845026

版权

Git 专栏收录该内容

28 篇文章 0 订阅

订阅专栏

解决git merge的冲突问题

方法1：放弃合并

git merge --abort

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)
$ git merge dev/james/new_protocol
Auto-merging recording/mngHandle.cpp
CONFLICT (content): Merge conflict in recording/mngHandle.cpp
Automatic merge failed; fix conflicts and then commit the result.

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit|MERGING)
$ git status
On branch dev/banting/new_protocol_unit
Your branch is up to date with 'origin/dev/banting/new_protocol_unit'.

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
        modified:   Jenkinsfile
        modified:   Makefile
        modified:   README.md
        modified:   recording/mngFormat.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   recording/mngHandle.cpp


Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit|MERGING)

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit|MERGING)
$ git merge --abort

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)
$ git status
On branch dev/banting/new_protocol_unit
Your branch is up to date with 'origin/dev/banting/new_protocol_unit'.

nothing to commit, working tree clean

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)

###方法2：修复冲突，然后提交

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)
$ git merge dev/james/new_protocol
Auto-merging recording/mngHandle.cpp
CONFLICT (content): Merge conflict in recording/mngHandle.cpp
Automatic merge failed; fix conflicts and then commit the result.

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit|MERGING)
$ git status
On branch dev/banting/new_protocol_unit
Your branch is up to date with 'origin/dev/banting/new_protocol_unit'.

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
        modified:   Jenkinsfile
        modified:   Makefile
        modified:   README.md
        modified:   recording/mngFormat.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   recording/mngHandle.cpp


Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit|MERGING)
Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)
Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit|MERGING)
$ git diff origin/dev/james/new_protocol recording/mngHandle.cpp
diff --git a/recording/mngHandle.cpp b/recording/mngHandle.cpp
index 5ea77bd..e009bf8 100644
--- a/recording/mngHandle.cpp
+++ b/recording/mngHandle.cpp
@@ -1920,6 +1920,72 @@ void CMngHandle::parseImageResult(int RC)
 }


+<<<<<<< HEAD
+
     +
     +//int Test::test_wave(FRAME& frameInfo)
     +//{
     +//    frameInfo.trigger_info->SD = 3;
     +//    frameInfo.raw_info->fmt = fmt_type_e::MULAW;
     +//    frameInfo.raw_info->strRawData.clear();
     +//    string strTest = "xxx.wav";
     +//    string strData;
     +//
     +//    return 0;
     +//}
     +
     +=======
     +>>>>>>> dev/james/new_protocol

 bool Test::checkExistInfo(std::list<int>& liAudio, int idx, int SD)
 {
 
Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/wyze-edgeai-integration-new_protocol_unit/recording (dev/banting/new_protocol_unit|MERGING)
$ vim mngHandle.cpp   //这里手动删除本地被注释的代码段及 <<<< ===== >>>>>

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/wyze-edgeai-integration-new_protocol_unit/recording (dev/banting/new_protocol_unit|MERGING)
$ git add .

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/wyze-edgeai-integration-new_protocol_unit/recording (dev/banting/new_protocol_unit|MERGING)
$ git status
On branch dev/banting/new_protocol_unit
Your branch is up to date with 'origin/dev/banting/new_protocol_unit'.

All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

Changes to be committed:
        modified:   ../Jenkinsfile
        modified:   ../Makefile
        modified:   ../README.md
        modified:   mngHandle.cpp

   


Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit/recording (dev/banting/new_protocol_unit|MERGING)
$ git commit -m "merge from dev/james_new_protocol and reslove merge conflict"
[dev/banting/new_protocol_unit 0063947] merge from dev/james_new_protocol and reslove merge conflict

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit/recording (dev/banting/new_protocol_unit)
$ git push origin dev/banting/new_protocol_unit
Enumerating objects: 164, done.
Counting objects: 100% (132/132), done.
Delta compression using up to 8 threads
Compressing objects: 100% (31/31), done.
Writing objects: 100% (86/86), 14.47 KiB | 1.03 MiB/s, done.
Total 86 (delta 72), reused 68 (delta 55), pack-reused 0
remote: Resolving deltas: 100% (72/72), completed with 30 local objects.
To github.com:wyzelabs-inc/wyze-edgeai-integration.git
   736bb60..0063947  dev/banting/new_protocol_unit -> dev/banting/new_protocol_unit