Exercise 6/10 git merge CANNOT PASS THROUGH AT ALL PLEASE HELP! Even tried to commit resume.txt and still doesn't work


#1




TRIED EVERY POSSIBLE WAY, EVEN MERGE AND CHECKOUT. IT'S A REALLY BAD BUG I GUESS.
Somebody please give a legit working solution, i can't go ahead due to this too :frowning:



#2

Trying things randomly is rarely effective when there are many options.
Instead one has to look at the situation, compare it to the desired situation, and then figuring out what actions would take you from the current situation to the desired one.

For example, say you're trying to sit down on a chair
TRIED EVERYTHING, EVEN JUMPING UP AND DOWN AND RUNNING IN CIRCLES
.. yeah, that's not helping. Instead you would need to find out whether there's a chair, if there isn't you'd have to look around, perhaps even go to the store and buy one.

Git is telling you why it won't do what you're asking. You'd start out by establishing what the problem is, so you gotta read what git says.

You might not see the solution from understanding the problem, but that's where you have to start. Git is pretty clear here about what is going on, you should be able to come up with an idea about what you want to change, even if you don't know how to carry that out. You could then ask about how to carry that out (though try googling first, the answer likely already exists somewhere)

If you're looking for entirely automated version control that you don't have to interact with, then git is not what you're looking for


#3

This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.