Skip to content

Fixed conflict resolution involving PersistentReferences

Éloi Rivard requested to merge azmeuk/sheraf:conflict-resolution-fix into master

In short the merge method avoid to pickle or hash objects to perform the 3-way merge.

Edited by Éloi Rivard

Merge request reports