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.
Try
git merge -X theirs devinstead.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!