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 commandscd <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
Thensudo git pull (only if you need to take the pull)
Email - contact@DevOpsSchool.com
Chetan is a Full Stack Software developer. He provides optimize solutions at each and every layer of the Enterprise application right from Front end to back end using demanding next gen technologies.
Worked with renowned software companies like ATCS Inc USA, Mercedes Benz USA, Intel, McAfee, JDA Software Inc, Infosys Limited
Expertise in Java/J2ee, PHP, Laravel, Javacript, Angular JS, JQuery, Html, CSS, Git, Aws, Node
1. Technical consultation to customers
2. Trainer on Java, J2EE, JavaScript and PHP Laravel frameworks, PL/SQL, Cross Platform Mobile App Development
3. Team Conflict resolution. Great Team Player
4. Quick Learner. Ability to adapt & expertise new or unknown technologies very easily and quickly
3. Ux/ Mock up screens/ Wire frame designing Skills
4. Excellent development skills
5. Automation Testing skills
6. Server hosting & deployment skills
7. Middle ware/ Server Technologies: Java, J2EE, Spring MVC, Spring Security, Spring Core,Hibernate, Struts, REST Web Services.
8. Web Technologies: Sencha ExtJS, Angular JS, JQuery, Bootstrap CSS, Html, Css, Javascript
9. Mobile Technologies: Cordova/ Phonegap, Ionic
10. Server side build tools: Ant, Maven
11. Web UI side build tools: Node JS, Grunt JS
12. Version Control Tools: Git, SVN, Source Tree
13. Server Side Testing Technologies: JUnit, REST Assured
14. Frontend Side Testing Technologies: JS Unit, Mocha, Sinon
- MyHospitalNow.com – PROD | Clean all patient user and related quote, bid and file data - March 21, 2020
- Sending Email with attachments in Laravel 5.5 using and PHP & JQuery - February 20, 2020
- How to run php artisan queue:listen in background on Ubuntu or Linux machine - February 6, 2020
