new git alias :
mergetool : rm -rf .
just delete all conflicts in code

A little more polite alternative:

Add this to ~/.gitconfig
[alias]
accept-ours = "!f() { git checkout --ours -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"
accept-theirs = "!f() { git checkout --theirs -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"

git accept-ours // anything on local wins

git accept-theirs // anything from remote wins

I wonder if someone really falls on that trap... It's older then Linux. hahaha