Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.
# alternate branches of object type conflict with each other
{ 'struct': 'One',
'data': { 'name': 'str' } }
{ 'struct': 'Two',
'data': { 'value': 'int' } }
{ 'alternate': 'Alt',
'data': { 'one': 'One',
'two': 'Two' } }