On Thu, Sep 5, 2019 at 4:31 PM Edward K. Ream <[email protected]> wrote:
> Don't panic. This is only a test. I created the rebase-test branch as > follows: > > git checkout -b rebase-test > git push origin rebase-test > git rebase *master* --strategy-option=*theirs* > > The last line took almost 10 minutes. In this branch, gitk show all work > since July 6 (the last commit to master) in a flat, linear, list of > commits. Note that "theirs" has a reversed meaning from merges. > I did push this briefly to origin, but then I thought better of it and deleted the branch. I you want to recreate what I did, you will find two or three conflicts, all involving the same deleted file. To resolve the conflict, do git rm <the file>. 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/CAMF8tS1D-%2BdXEdUm2wZr-O5OcK662r4abd7VTQPDwRb-67JYUw%40mail.gmail.com.
