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 nothing else. But also you can use it to see what is different than if you had resolved the merge conflicts "correctly". What follows is my transcript of following that advice. Create the throwaway, temporary branches $ git branch old-keys cc568d628 $ git branch old-devel 060811435 Run the merge $ git checkout old-devel $ git merge old-keys Auto-merging leo/core/leoGlobals.py Auto-merging leo/core/leoCommands.py Auto-merging leo/config/leoSettings.leo CONFLICT (content): Merge conflict in leo/config/leoSettings.leo Auto-merging leo/commands/editCommands.py Automatic merge failed; fix conflicts and then commit the result. The conflict looks pretty easy to resolve. New vnodes were added in the same place in both branches. All the new vnodes should be kept $ git diff leo/config/leoSettings.leo diff --cc leo/config/leoSettings.leo index 7c2977cb8,bab3e06d2..000000000 --- a/leo/config/leoSettings.leo +++ b/leo/config/leoSettings.leo @@@ -2321,7 -2319,8 +2321,12 @@@ <v t="tbrown.20140505094209.37266"><vh>@bool outline-tabs-show-close = True</vh></v> </v> </v> ++<<<<<<< HEAD +<v t="ekr.20110611092035.16480"></v> ++======= + <v t="ekr.20060603215208"></v> + <v t="ekr.20060925060533.4"></v> ++>>>>>>> old-keys </vnodes> <tnodes> <t tx="TL.20080702085131.2">If True: Save the Leo file and all modified derived files every time the external editor saves a modified file. Since we want to keep all the lines, use vim to remove the "<<<<<", "=====", ">>>>>>" merge conflict cruft: $ vim leo/config/leoSettings.leo Commit the merge $ git add leo/config/leoSettings.leo $ git commit -m "Merged old-keys into old-devel" See what changes from the keys branch still aren't in devel. Looks like there are a few still: $ git diff devel..old-devel leo/config/leoSettings.leo diff --git a/leo/config/leoSettings.leo b/leo/config/leoSettings.leo index 7c01ef527..dac0e2cbf 100644 --- a/leo/config/leoSettings.leo +++ b/leo/config/leoSettings.leo @@ -2321,7 +2321,9 @@ <v t="tbrown.20140505094209.37266"><vh>@bool outline-tabs-show-close = True</vh></v> </v> </v> +<v t="ekr.20110611092035.16480"></v> <v t="ekr.20060603215208"></v> +<v t="ekr.20060925060533.4"></v> </vnodes> <tnodes> <t tx="TL.20080702085131.2">If True: Save the Leo file and all modified derived files every time the external editor saves a modified file. @@ -3612,19 +3614,25 @@ delete-comments = Ctrl-parenright # Shift-Ctrl-0 delete-word = Ctrl-Delete delete-word = Keypad+Ctrl+Delete delete-spaces = None +### NEW: indent-region !text = Tab -indent-region = ctrl-greater # Ctrl-shift-> +### OLD: +# indent-region = Tab # Only when text is selected. +# indent-region = ctrl-greater # Ctrl-shift-> kill-line = Ctrl-k kill-to-end-of-line = None -newline-and-indent = Ctrl-j -### newline-and-indent !text = Tab +# newline-and-indent = Ctrl-j +# newline-and-indent !text = Tab focus-to-body !tree = Tab paste-text = Ctrl-v reformat-paragraph = Shift-Ctrl-p split-line = None unformat-paragraph = Shift-Ctrl-u -unindent-region = ctrl-less # Ctrl-Shift-< -unindent-region = Shift-tab # Only when text is selected. +### NEW +unindent-region !text = Shift-Tab +# OLD: +# unindent-region = ctrl-less # Ctrl-Shift-< +# unindent-region = Shift-tab # Only when text is selected. yank = Ctrl-Y yank-pop = Alt-Y zap-to-character = Alt-z</t> Brian On Sun, Jul 26, 2020 at 12:36 PM Edward K. Ream <[email protected]> wrote: > On Sun, Jul 26, 2020 at 10:32 AM Brian Theado <[email protected]> > 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 merge commit shows which commit the keys branch used to > point to: > > Thanks for this. I'm less alarmed now :-) > > However, I am not happy with gitk (or git log) as a means of seeing what > has happened. Perhaps I am missing something. Yesterday I did discover git > views, but they haven't helped nearly as much as I would have liked. > > And where is the search function in gitk? > > Edward > > -- > 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/CAMF8tS2x99q53QW%2BnGeSHRe9%2Bue9Fj02mNuY5kvJ9m3oH95zDA%40mail.gmail.com > <https://groups.google.com/d/msgid/leo-editor/CAMF8tS2x99q53QW%2BnGeSHRe9%2Bue9Fj02mNuY5kvJ9m3oH95zDA%40mail.gmail.com?utm_medium=email&utm_source=footer> > . > -- 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/CAO5X8CxTkB3PVRf51DHuA6HxdECp8Q%3DgpAqNQNgPSxQcfjyBKg%40mail.gmail.com.
