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

Dietmar Krause
Dietmar Krause
6,229 Points
Posted by Dietmar Krause
Dietmar Krause
6,229 Points

git bash on Windows - Automatic merge falied always

I am making the git Basics and i have git bash on my Windows Computer (installed as shows in the video). In the git merge case in the video i simply get an error message every time, even in the simple editing cases, no automatic merging possible as far as i see. After manually editing everything seems to be fine. Any ideas? Dietmar from germany

1 Answer

Dietmar Krause
Dietmar Krause
6,229 Points
Dietmar Krause
Dietmar Krause
6,229 Points

fixed it by myself. I installed kdiff3 and now merging is easy. At first i couldnt comprehend the merging story i got an error where there wasnt one in the video by typing the same thing under git for windows.