Git error: Yourlocalchangestothefollowingfileswouldbeoverwritten

Source: Internet
Author: User
& Amp; nbsp; today, gitpull on the server has the following error: Yourlocalchang

 

Today, the following error occurs in git pull on the server:

Error: Your local changes to the following files wocould be overwritten by merge:

Application/config. php

Application/controllers/home. php

Please, commit your changes or stash them before you can merge.

Aborting

If you do not know the cause of the code conflict, the solution is as follows:

If you want to retain the changes made on the production server, just incorporate the new configuration items:

Git stash

Git pull

Git stash pop

Then, you can use git diff-w + file name to confirm the automatic code merging.

If you want to use a file in the code library to completely overwrite the local working version, the method is as follows:

Git reset -- hard

Git pull

 

Related Article

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.