Feedback?
Login

nader's thinkery

nader is using thinkery to extend his/her brain and is sharing these things. Check out what it's about!

+

Drop for new tag

All 298

Favorite

read 51

All

url 64
video 53
thinkery 26
fun 22
business 22
picture 15
tutorial 12
development 12
saas 9

All tags ↓

You’re in the middle of a conflicted merge (git) « 42
_{url git reset tutorial Monday, December 20, 2010}

You’re in the middle of a conflicted merge (git) « 42

You’re in the middle of a conflicted merge (git) « 42

url git reset tutorial Dec 20, 2010

Public
- Private
- Public

Share:

Edit
Archive
Delete

Extracted Page: http://www.42.mach7x.com/2009/11/24/youre-in-the-middle-of-a-conflicted-merge-git/

You’re in the middle of a conflicted merge (git) « 42

Problem
Trying to update (pull) in git causes the error ‘you’re in the middle of a conflicted merge’.

Solution
To be able to get out of this error try the followng:

git reset –hard HEAD
git fetch origin
git reset –hard origin

to reset the state, and then you should be able to use git pull as normal.

Additional text has been truncated due to copyright reasons. Things without URLs and private things don't get truncated.

Autosaved

No Things found. nader hasn't shared anything.

Tools
API
About
Blog
Community
Donate
Contact
Privacy

© 2024 appstretto + kirk

Login to your brain

Username:

Password: Forgot password?

Report a problem

Create account

All the things that you have created so far will remain in your account.

E-Mail:

Username:

Password:

Already have an account? Login »