On Thursday, September 5, 2019 at 4:31:09 PM UTC-5, Edward K. Ream wrote: I created the rebase-test branch as follows: > > git checkout -b rebase-test > git push origin rebase-test > git rebase *master* --strategy-option=*theirs* >
I forgot to mention that rebase-test is based on devel, not master. 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/21a036d9-b05b-4961-9268-766a627eae53%40googlegroups.com.
