I tried git merge -X theirs hello.txt and received the message merge: hello.txt - not something we can merge Have you encountered this?
git merge -X theirs hello.txt
merge: hello.txt - not something we can merge
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!
git merge -X theirs dev
thanks!
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
I tried
git merge -X theirs hello.txt
and received the messagemerge: hello.txt - not something we can merge
Have you encountered this?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!
thanks!