This teaches me not to rush to delete a branch once it's not needed any more.
On Sunday, July 26, 2020 at 6:52:07 AM UTC-4, Edward K. Ream wrote: > > On Saturday, July 25, 2020 at 9:03:53 AM UTC-5, Edward K. Ream wrote: > > P. S. I am alarmed by the potential loss of data when merging git branches. > > When I merged the "keys" branch into devel I mistakenly resolved a merge > conflict by taking devel's version of leoSettings.leo. That was just wrong. > > After deleting the "keys" branch, there seems to be no way recover the > lost key bindings. I would have thought that the git merge would have > preserved all previous changes to leoSettings.leo, but I was not able to > see those changes. Fortunately, the required change could easily be deduced. > > Hmm. Perhaps creating a PR, as I should have done, would have fixed the > problem. Yes, I think so. The PR would have recorded the contents of > leoSettings.leo, without knowing that a conflict would have resulted. > > EKR > -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/3db7fa80-b4d2-495e-ac56-827f707d65bbo%40googlegroups.com.
