title: Git merge while discarding any previous changes(In local repository or from the last commit)
body: <p>In Git, during a merge, is there a way that we can tell git to discard local changes in case of a conflict and apply the changes from the merged branch?</p>
  
  <p>I mean if there is a way, then we can do merges like branch merges without conflicts.</p>