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 Basic Merging

Christopher Borchert
Christopher Borchert
14,814 Points
Posted by Christopher Borchert
Christopher Borchert
14,814 Points

Automerge failed? Git is not using the recursive algorithm.

When trying the exercise in this lesson: Change one line of the code in the master branch, and then changing a different line of the code in the child branch (is that the correct term? The downstream branch?), and finally merging them, git was not able to automatically merge the file and resolve the conflicts. Is this normal?

4 Answers

Jim Withington
Jim Withington
12,025 Points
Jim Withington
Jim Withington
12,025 Points

This happened to me, too.

Alirio Lancheros
Alirio Lancheros
3,522 Points
Alirio Lancheros
Alirio Lancheros
3,522 Points

I had the same issue. Please somebody which gives help about it.

Satu Korhonen
Satu Korhonen
3,360 Points
Satu Korhonen
Satu Korhonen
3,360 Points

I also had the same issue. Can someone explain and offer some info on how to fix this?

Douglas Benson
PLUS
Douglas Benson
Courses Plus Student 2,490 Points
Douglas Benson
Douglas Benson
Courses Plus Student 2,490 Points

$ git merge foo_feature Auto-merging README CONFLICT (content): Merge conflict in README Automatic merge failed; fix conflicts and then commit the result.

The same problem