In my project I checked out to another branch and then everything is fine, so I want to merge it and *overwrite the master branch. And I found the same problem in bitbucket, and I just copied
git merge master --strategy=ours
But, this is to overwrite my current branch …
read more