If You Are Having A Huge Merge Conflict And Only Want To Use The Changes From One Branch

TopicSource
๐Ÿ–ฅ๏ธ Techgithub - Git merge with force overwrite - Stack Overflow

git merge --strategy=ours master

  1. Git revert can help you undoing a specific commit
  2. Git clean has the power to undo all untracked changes to your repository