Git merge while discarding any previous changes(In local repository or from the last commit)

Question

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?

I mean if there

Answer 1

If you want to ignore all local changes, and an additional merge commit you want to just move your branch to the remote HEAD.

git log --oneline origin/master
# assume the first sha is bbdfa17
git reset --hard bbdfa17

Now you are at the tip of the tree with no merge commits.