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 Dan Szeezil
Dan Szeezil
2,823 Points

Different merge conflict response

I am getting a different response when I attempt to merge the two files instead of what happens on the video. I get : merge: file1 - not something we can merge

But I dont get a text file to open and solve the conflicts manually. Any clues? NOTE: this is on my computer's terminal, not the Treehouse terminal.

1 Answer

Trevor Pierce
Trevor Pierce
1,480 Points
Trevor Pierce
Trevor Pierce
1,480 Points

Hey Dan, I don't think the text file will automatically open for you to resolve and that you would have to open the file and fix the merge conflict yourself / manually. If that is not the issue then I found this post on Stack Overflow that might be a solution to your problem. How to resolve gits not something we can merge error

UPDATE: Part one of my response was confirmed, you need to open the file and fix the merge. This becomes obvious when you have multiple files with merge conflicts, which one would it know to open? Treehouse has some sexy magic that is opening the file automatically for you.