Module resolver 

Ready-made standard merge resolvers.

Functions

delete_wins

Delete the key when either side deleted it; otherwise leave unresolved.

prefer_left

Prefer the left side. If left deleted the key, delete it.

prefer_right

Prefer the right side. If right deleted the key, delete it.

update_wins

Keep the updated side for delete/update conflicts; otherwise leave unresolved.