How I got this error:
I had to take a pull in my project directory
I tried to take the pull by running the below commands
cd <My Project Directory>
sudo git pull

The outcome of the above command was:

root@ip-172-31-20-213:/opt/lampp/htdocs/sp-hospital-ms# sudo git pull
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 5), reused 0 (delta 0)
Unpacking objects: 100% (7/7), done.
From bitbucket.org:surgeryplanet/sp-hospital-ms
6c3214b..bd047fe master -> origin/master
Updating 6c3214b..bd047fe
error: Your local changes to the following files would be overwritten by merge:
app/Http/Controllers/PassportApi/QuoteManagementController.php
Please commit your changes or stash them before you merge.
Aborting
root@ip-172-31-20-213:/opt/lampp/htdocs/sp-hospital-ms# sudo git pull -f
Updating 6c3214b..bd047fe
error: Your local changes to the following files would be overwritten by merge:
app/Http/Controllers/PassportApi/QuoteManagementController.php
Please commit your changes or stash them before you merge.
Aborting
root@ip-172-31-20-213:/opt/lampp/htdocs/sp-hospital-ms#

As you can see it is telling me that I have some local changes in a file with name QuoteManagementController.php. In fact there was no real local change to that file

Then I tried to check the difference by issuing the command show below:
git diff --unified=0 app /Http/Controllers/PassportApi/QuoteManagementController.php

The output was:
diff --git a/app/Http/Controllers/PassportApi/QuoteManagementController.php b/ap p/Http/Controllers/PassportApi/QuoteManagementController.php
old mode 100644
new mode 100755

Solution:
Run the command given below in your project’s home directory:
git config core.filemode false
Then
sudo git pull (only if you need to take the pull)

«

Prev

1

/

1

Next

»

Session 1 advance git aug 2020 git introduction — By DevOpsSchool

Session 2 advance git aug 2020 git workflow — By DevOpsSchool

Session 3 advance git aug 2020 git workflow — By DevOpsSchool

Session 4 advance git aug 2020 git working with remote github — By DevOpsSchool

Session 5 advance git aug 2020 git branching — By DevOpsSchool

Session 6 advance git aug 2020 git branch merging — By DevOpsSchool

Session 7 Advance Git Aug 2020 Git fetch undoing config gitignore — By DevOpsSchool

Session 8 Advance Git Aug 2020 Git Stash Tag — By DevOpsSchool

Session 9 Advance Git Rebase Sourcetree — By DevOpsSchool

Session 10 Advance Git Working With Gitlab — By DevOpsSchool

Session 11 Advance Git Working With Gitlab Git Reset — By DevOpsSchool

«

Prev

1

/

1

Next

»

Chetan

Say goodbye to the hassles of bike ownership! MotoShare.in offers affordable rentals, whether you need a scooter for errands, a bike for a road trip, or a reliable ride to explore new cities.