Showing merge conflict on "git add ." on Module 4

Hi! I’m getting a merge conflict message on executing git add . but when I’m executing git mergetool it shows No files need merging.

Here’s my console output…

crio-user@arunangshubsws:~/workspace/arunangshubsws-ME_QBOX$ git add .
 __  __                        ____             __ _ _      _   
|  \/  | ___ _ __ __ _  ___   / ___|___  _ __  / _| (_) ___| |_ 
| |\/| |/ _ \ '__/ _` |/ _ \ | |   / _ \| '_ \| |_| | |/ __| __|
| |  | |  __/ | | (_| |  __/ | |__| (_) | | | |  _| | | (__| |_ 
|_|  |_|\___|_|  \__, |\___|  \____\___/|_| |_|_| |_|_|\___|\__|
                 |___/                                          
 ____       _            _           _ _ _ 
|  _ \  ___| |_ ___  ___| |_ ___  __| | | |
| | | |/ _ \ __/ _ \/ __| __/ _ \/ _` | | |
| |_| |  __/ ||  __/ (__| ||  __/ (_| |_|_|
|____/ \___|\__\___|\___|\__\___|\__,_(_|_)
                                           

Looks like there are merge conflicts in the following files:
/home/crio-user/workspace/arunangshubsws-ME_QBOX/debugging/high_cpu_usage_analysis
Do you know what a merge conflict is and how to resolve it ? [y/n]: y
Try running git add . again once all merge conflicts have been resolved.
crio-user@arunangshubsws:~/workspace/arunangshubsws-ME_QBOX$ git mergetool
No files need merging
crio-user@arunangshubsws:~/workspace/arunangshubsws-ME_QBOX$ 

My git log output…

crio-user@arunangshubsws:~/workspace/arunangshubsws-ME_QBOX$ git log
commit 4c42e78bfcd234e3c7525dfe820aa349662363b3 (HEAD -> master)
Merge: e7743f6 e98cdb8
Author: CrioUser <crio-user@criodo.com>
Date:   Mon Feb 3 06:25:19 2020 +0000

    Merge branch 'master' of gitlab.crio.do:ME_QBOX_STUBS/ME_QBOX_MODULE_DEBUGGING_STUB

commit e98cdb88b28ddb654bb3e2d2972815a00b234e70 (ME_QBOX_MODULE_DEBUGGING_STUB/master)
Author: Crio.GitLab <admin@example.com>
Date:   Sun Feb 2 04:46:55 2020 +0000

    Update QBox_benchmark

commit e7743f6514265c9e9401c9e8dc2049a1f075e7a7 (origin/master)
Author: CrioUser <crio-user@criodo.com>
Date:   Sat Feb 1 16:04:12 2020 +0000

    ME_QBOX_MODULE_CLIENT_SERVER

commit c3ef1ec5cde470a9361dd446dc504bb194386619
Author: Crio.GitLab <admin@example.com>
Date:   Sat Feb 1 12:40:56 2020 +0000

    Add new file

commit 039115f3ea282fd582c1f98026bad842daad4366
Author: Crio.GitLab <admin@example.com>
Date:   Sat Feb 1 12:39:35 2020 +0000

    Add new directory

commit f9d459d35098f2526b173a881458cfb408903ff6
Merge: 114ebf6 d613433
Author: CrioUser <crio-user@criodo.com>
Date:   Sat Feb 1 09:15:13 2020 +0000

    Merge branch 'master' of gitlab.crio.do:ME_QBOX_STUBS/ME_QBOX_MODULE_CLIENT_SERVER_STUB

commit 114ebf62530bfd3ba95e4e1908492542c1a0e1db
Author: CrioUser <crio-user@criodo.com>
Date:   Sat Feb 1 08:05:30 2020 +0000

    ME_QBOX_MODULE_SERVER_CONFIGURATION

commit 4e4e9844cc269b4c2333d94f129c4e76485c486d
Author: CrioUser <crio-user@criodo.com>
Date:   Sat Feb 1 08:02:09 2020 +0000

    ME_QBOX_MODULE_SERVER_CONFIGURATION

commit b44a72169c22dbcedaaa3806c2ab1060977d79a5

My git status output…

crio-user@arunangshubsws:~/workspace/arunangshubsws-ME_QBOX$ git status
On branch master
Your branch is ahead of 'origin/master' by 6 commits.
  (use "git push" to publish your local commits)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   debugging/QBox_benchmark
        modified:   debugging/setup.sh

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

        debugging/file_transfer_not_possible_analysis
        debugging/file_transfer_not_possible_direction
        debugging/file_transfer_not_possible_versions
        debugging/high_cpu_usage_analysis
        debugging/high_cpu_usage_versions
        debugging/high_memory_usage_analysis
        debugging/high_memory_usage_versions
        debugging/incorrect_file_permission_analysis
        debugging/incorrect_file_permission_versions
        debugging/increased_time_taken_analysis
        debugging/increased_time_taken_direction
        debugging/increased_time_taken_versions

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

Can you show the output for git status ?

Here you go >> Showing merge conflict on "git add ." on Module 4

I’ve solved the problem! Turns out the problem was caused by me using ‘=’ symbol in the high_cpu_usage_analysis file as a line to increase the aesthetic appeal as shown below…

HEADING
===============================
Lorem Ipsum Dolo Sit Amet.

And this made the crio merge conflict checker to mistake it for a merge conflict boundary line. :joy: :joy: