Re: **Important**: keys branch merged into devel

On Sun, Jul 26, 2020 at 4:36 PM Brian Theado wrote: > The git log command I shared shows the diffs for leoSettings in your keys > branch. That didn't help you? > > $ git log -p cc568d628 leo/config/leoSettings.leo > > Wow. Great job of sleuthing. Finding this commit was what stumped me. I just l

Re: **Important**: keys branch merged into devel

The git log command I shared shows the diffs for leoSettings in your keys branch. That didn't help you? $ git log -p cc568d628 leo/config/leoSettings.leo Since all the history is still there, you could redo the merge locally using temporary throwaway branches. For educational purposes, if nothin

Re: **Important**: keys branch merged into devel

On Sun, Jul 26, 2020 at 10:32 AM Brian Theado wrote: > From https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell, "a branch in Git is simply a lightweight movable pointer to one of these commits". So when you delete a branch, you only lose the named pointer to the commit. Your mer

Re: **Important**: keys branch merged into devel

Edward, On Sun, Jul 26, 2020 at 6:52 AM 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 wr

Re: **Important**: keys branch merged into devel

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 branche

Re: **Important**: keys branch merged into devel

On Saturday, July 25, 2020 at 9:03:53 AM UTC-5, Edward K. Ream wrote: > This concludes #1269 : refactor Leo's key-handling code. Rev 64c49da6 in devel restores an important key binding that was reverted when merging the "keys" branch into d

**Important**: keys branch merged into devel

This concludes #1269 : refactor Leo's key-handling code. Several weeks (months) ago I asked Leonistas to test the keys branch. I have received no complaints, but I'm not sure that means anything. Please report any problems. The new code is