Git version control tool used: Error pulling origin:error:Your local changes to the following files would is overwritten by merge

Source: Internet
Author: User

Excerpted from: CSDN Inverse cheers

Git in pull, when this error occurs, many people may enter the stash, related stash see: Error pulling Origin:error:Your local changes to the following files would be overwritten by merge

But after discovering stash still appears: Error pulling origin:error:The following untracked working tree files would be overwritten by merge ...

In fact, you see the error hints, it is because some untracked working tree files caused problems. So as long as the solution of these untracked files can solve this problem.

There are two ways to resolve this:

One way: If you have a Git tool, of course, a graphical tool, such as tortoisegit, you can use these tools to select your project folder, right-click cleanup.

Way two: Through the command line, you directly execute git clean-d-fx can. Maybe a lot of people don't understand what-d,-fx really mean, the next article on git will introduce git clean-related things.

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.