Welcome to the Treehouse Community
Looking to learn something new?
What do I remove or keep in console
Because if I remove all it is saying u removed what wanted to keep. If remove one it telling first pessemitic branch
This is a text file! It's a fun little text file - it never really did anything to hurt anyone. The only problem with our fun little text file is that it has conflict resolution issues. <<<<<<< HEAD Whenever it runs into a problem, it asks other people for help. <<<<<<< HEAD Maybe you can help it resolve its issues? ======= But it's a very needy file, so people often leave it alone. >>>>>>> pessimistic_branch
For the first conflict you need to delete the markers and also the content you don't want.
<<<<<<< HEAD It tries its best to resolve problems on its own. ======= It pretty much can't ever resolve problems. >>>>>>> pessimistic_branch
To resolve this block to the HEAD, you will have this line left.
It tries its best to resolve problems on its own.
Or to resolve this block to the pessimistic_branch, you will have this line left.
It pretty much can't ever resolve problems.
It has to be one of these options or the other. I hope this makes sense.
Jonathan GrieveTreehouse Moderator 91,053 Points
So for a merge conflict it'll display a message in your console telling you where there's been a merge conflict in Git and the content you might want to keep.
You then need to go to the file where the conflict has taken place, make the changes, save the changes and then stage and commit those changes in Git.
Conflict resolution is about clearing up the "mess" in the file and deciding how you want your file to look when you stage the conflict resolution to Git. :-)