DEV Community

Discussion on: Master Git in 7 minutes

Collapse
myerschris78 profile image
Chris Myers

I tried git merge -X theirs hello.txt and received the message merge: hello.txt - not something we can merge Have you encountered this?

Collapse
valeriavg profile image
Valeria Author

Try git merge -X theirs dev instead.
I apologise for this mistake, git merge requires a branch name, of course, not the file name. I've corrected that in the article, thank you!

Collapse
myerschris78 profile image
Chris Myers

thanks!