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 trialThomas Katalenas
11,033 PointsI 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
17,151 PointsRobert Leonardi
17,151 Pointswhy 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