Versions Compared

Version Old Version 2 New Version Current
Changes made by

Dominik Zajkowski

Dominik Zajkowski

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Code Block
def merge(conflictResolver: ConflictResolver[C])(parentHash: Blake2b256Hash, hashA: Blake2b256Hash, hashB: Blake2b256Hash): Option[Blake2b256Hash]


Conflict Resolution

Block merging - conflict resolution - peek

The current implementation does a mapping:

...