You had not concluded your merge (Merge_head exists) git pull failed

Source: Internet
Author: User
Tags reset

You have a not concluded your merge (Merge_head exists).
Please, commit your changes before you can merge.

The error may be caused by the fact that the code you pull down before is not automatically merged.

There are 2 solutions:

1. Keep your local changes

git merge--abort

git reset--merge

Make sure to submit this local merge after merging

And then get the online warehouse.

Git pull


2.down Offline code version, discard local changes

This is not recommended, but if you do not have local modifications, or you have a copy of your backup, you can directly overwrite the latest version of the online

git fetch--all

git reset--hard origin/master

git fetch


Of course, there is one of the most stupid way, is to clone a copy of the code, discard the working directory, haha, joking.



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.