How to ignore merge conflicts for identical changes

Question

I got this merge conflict:

my %frame_name =  (
<<<<<<< Updated upstream
    G => 'GOTO',
    D => 'DBGF',
    C => 'FROM',
=======
    G => 'GOTO',
    D => 'DBGF',
    C => 'FROM',
>>>>>>> Stashed changes
);

It it possible to force git for merging such conflicts automatically?

Answer 1

Abort your merge and try your merge while ignoring white-space:

git merge --abort
git merge -Xignore-space-change whitespace

The first option ignores whitespace completely when comparing lines, the second treats sequences of one or more whitespace characters as equivalent.

More information (see the "Ignoring Whitespace" section)

See this answer as well.