Reputation: 5178
I have never had any trouble creating a rails project in the past. I am all of a sudden getting the following error when I run rails new foobar
from the desktop:
bin/rails:6: syntax error, unexpected <<, expecting end-of-input
<<<<<<< HEAD
^
Anyone know what is going on here?
Upvotes: 0
Views: 33
Reputation: 1322
This is how git usually marks conflicts when merging. You should open the bin/rails
file and manually resolve conflicts.
Edit it, keeping the parts you want. If you're not sure which file gives this error message, search for <<<<
.
Check also this guide, around the middle it presents how a merge conflict looks.
Upvotes: 4
Reputation: 8988
Seems like you have a merge conflict in your bin/rails
. What are the contents.
Upvotes: 0