rem’s avatarrem’s Twitter Archive—№ 51,955

  1. If I want to merge a branch into master, and want to discard conflicts, is it git merge branch -X theirs?