Module merge 

Combining two copies of a library that changed apart.

Git moves the file between machines, but it merges by line, and two machines that each saved a command have both added lines at the end of the same list. Git calls that a conflict although nothing clashes. The merge here works on entries by id instead, so the only real conflict is one entry changed differently in two places.

Structs

Merged

The outcome of combining this machine’s library with the synced one.

Functions

merge

Merges ours and theirs, both descended from base.