larkery / zsh-histdb

A slightly better history for zsh
MIT License
1.25k stars 74 forks source link

Add support for merging unrelated Git histories #119

Open IngoMeyer441 opened 2 years ago

IngoMeyer441 commented 2 years ago

When merging unrelated Git histories, the merge driver uses an empty ancestor database. Thus, the SQL max function cannot operate and returns a null value during the merge, effectively discarding our database during the merge. This PR ignores the ancestor database if it is empty, so both histories are fully preserved in this corner case.