Welcome to the Treehouse Community

Want to collaborate on code errors? Have bugs you need feedback on? Looking for an extra set of eyes on your latest project? Get support with fellow developers, designers, and programmers of all backgrounds and skill levels here with the Treehouse Community! While you're at it, check out some resources Treehouse students have shared here.

Looking to learn something new?

Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and join thousands of Treehouse students and alumni in the community today.

Start your free trial

Development Tools Git Basics Merging Merge Conflicts

Posted by Thomas Katalenas
Thomas Katalenas
11,033 Points

I couldn't find .git/MERGE_HEAD

ls into .git and it wasn't there, is it in another subdirectory of .git, or is this a common problem?

Robert Leonardi
Robert Leonardi
17,151 Points
Robert Leonardi
Robert Leonardi
17,151 Points

why would you want to find MERGE_HEAD? All you need is resolve the conflicting file (as video: by opening the file, edit what u need, save, close file) then commit it check git log, then u should be fine

robert@RobertLeonardi MINGW64 /c/xampp/htdocs/THCourse/git/mySecondRepo (master)
$ git merge foos
Auto-merging file2
CONFLICT (content): Merge conflict in file2
Automatic merge failed; fix conflicts and then commit the result.

robert@RobertLeonardi MINGW64 /c/xampp/htdocs/THCourse/git/mySecondRepo (master|MERGING)
$ vim file2

robert@RobertLeonardi MINGW64 /c/xampp/htdocs/THCourse/git/mySecondRepo (master|MERGING)
$ git commit -a
[master e1155b4] Merge branch 'foos'

robert@RobertLeonardi MINGW64 /c/xampp/htdocs/THCourse/git/mySecondRepo (master)
$ git log