On Sunday, March 29, 2020 at 10:29:36 PM UTC-4, Matt Wilkie wrote: > > > b) merge early, merge often: as in daily. This way any given upstream > change can (usually) be inspected and accepted/changed in small easy to > understand pieces. Use an interactice tool like WinMerge or Kmeld to do the > merging. (WinMerge has been easiest for me to understand, the keyboard > shortcuts make sense to me.) >
Thanks for your advice, Matt. I really don't want to spend time doing daily merges if I can avoid it. And I'll look at Winmerge. I think my ideal would be to create a branch in my fork that would only contain the files I'm working on. But Git (or at least Github desktop) doesn't seem to work that way. Otherwise I suppose that frequent updates from upstream would be the best way to go. > Really though if what you're doing now is successful keep doing it! VR3 is > awesome. Better you spend your precious attention on building cool things > like that than figuring out git arcana. ;-) > Well, thanks! Though I feel that I'm just resurrecting Peter Mills's work and giving it a few tweaks. > > -matt > -- 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/5fad1849-6dc6-4a3c-a467-35bb2ec38b0b%40googlegroups.com.
