Git: common solution to code conflicts

Source: Internet
Author: User

If some configuration files in the system have been modified on the server, and some new configuration items will be added after development,

Code conflict occurs when this configuration file is published:

Error: Your local changes to the following files wocould be overwritten by merge:
Protected/config/Main. php
Please, commit your changes or stash them before you can merge.

If you want to retain the changes made on the production server and only incorporate the new configuration items, the solution is as follows:

git stashgit pullgit stash pop

Then, you can use git diff-W + file name to confirm the Automatic Code merging.

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

git reset --hardgit pull

Git reset is for version. If you want to roll back local modifications to the file, use

git checkout HEAD file/to/restore


Iefreer

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.