On Mon, Jul 3, 2017 at 5:22 PM, Terry Brown <[email protected]> wrote:
> > I think it could have been done with git. Of course it could have. > I wonder if some variation > > of the above was what caused the problem in the first place - the > possibility I only just thought of being "No to all" when "Yes to all" > was more appropriate. Wondering if that could cause both branches to > have the same hash, and lead to them collapsing together. > Git would be broken if that were true. I did do something slightly strange earlier. I untracked the sqlite-format branch, as described here <https://stackoverflow.com/questions/3046436/how-do-you-stop-tracking-a-remote-branch-in-git>. I did this because I was getting fast-forward errors. It's all pretty strange. > The big question is, how to make sure the present master code forms > > the basis of important branches? I'm not sure that a merge from > > master to sqlite-format will do the trick. In other words, I suspect > > that sqlite-format is dangerous, through no fault of Vitalije. > > I don't see any reason for concern. The sqlite-format branch is still > pointing to a commit before the discontinuity, and I just tested (post > 3a9e54e) checking it out, merging master, committing, switching back to > master, committing. Nothing seemed to go wrong, branches remained > separate. > Thanks for this test. 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 post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
