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

Kelcey Wilson
Kelcey Wilson
15,738 Points
Posted by Kelcey Wilson
Kelcey Wilson
15,738 Points

Getting error: merge: README - not something we can merge

I have been following all of the Git lessons on my Mac's console, and everything has worked so far, but now I'm getting the error shown above. Any idea what's wrong?

Ryan Ruscett
Ryan Ruscett
23,309 Points
Ryan Ruscett
Ryan Ruscett
23,309 Points

what action are you trying to run. Is this a Push or a Pull etc. That is the key to understanding this error.

2 Answers

Kelcey Wilson
Kelcey Wilson
15,738 Points
Kelcey Wilson
Kelcey Wilson
15,738 Points

Whoops. Thank you Ryan. I discovered the problem. I was attempting to merge the file README, rather than the branch. So, I was doing this: git merge README when I should have done this: git merge [branch]

Philomath Ingeniare
Philomath Ingeniare
12,441 Points
Philomath Ingeniare
Philomath Ingeniare
12,441 Points

Have you checked the branch names? Seems like the error occurs when a merge is called with a non-existent branch. http://stackoverflow.com/questions/16862933/how-to-resolve-gits-not-something-we-can-merge-error