On Thursday, March 12, 2020 at 6:31:16 PM UTC-4, Matt Wilkie wrote: > > Git's branching and merging always confuses me, let alone across forks. > Meaning: don't feel bad, you're not alone! > > The network graph at https://github.com/tbpassin/leo-editor/network shows > your VR3 branch (top black line for me) as starting in the middle of > nowhere, not rooted to any Leo branch. Maybe this has something to do with > it? >
Thanks for the encouragement. I did start a new VR3 branch in my clone. That's what you are supposed to do to work on a new feature. I tried to merge it with the clone's devel branch, but something weird went on and I couldn't see how to do it within Github Desktop. So I just copied the changed and new files into (my clone's) devel branch. I (think that I remember) committing that before making the PR. I'm more used to working with Mercurial Hg. It would have opened kdiff3 and shown the two versions side by side, highlighting the differences, and I could just walk through the changes, accepting the ones I wanted for the merge. I'm not sure how to do the equivalent thing in GitHub. Still, I don't see why just copying the final files over into devel (on my clone) wouldn't have worked. -- 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 leo-editor+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/cc567822-3764-4579-866b-acba9353482c%40googlegroups.com.
