Upstream means the original repo, the Leo-editor repo on Github in this case. Origin means one's own clone, if any. *Upstream* and *Origin* are standard terms. Git Extensions is a Windows program, nothing to do with Python or anaconda, which I find easier to work with than just git itself (although it has its own learning curve).
Don't feel bad, I get confused about git/GitHub all the time. I'm not really the person to ask abut git questions, I'm afraid. I think I know this much: if you are using git from the command line, you would want to start by checking out the devel branch. You want to cd to the top directory where git stores the Leo-editor repository on your computer. Then git checkout devel That should get you the latest version of the devel branch. Then you have to make sure that Python uses it. I don't know how you have been doing that. How I do it, without Anaconda, is to set the PYTHONPATH environmental variable: set PYTHONPATH=c:\tom\git\leo-editor Then start Leo by running it from the command line: python -m leo.core.runLeo If you are not using git from the command line, someone else (or Prof. Google) will have to help you. On Tuesday, January 11, 2022 at 6:45:32 PM UTC-5 Rob wrote: > Not sure I understand that (what does `Upstream` mean?). I don't know > about Git Extensions on Windows (I'm in an Anaconda environment, in case > that matters). I'm not pulling from Origin. When I switch back to the devel > branch, I get the same error and when I switch again to master, Leo starts > fine. > > Do I need to delete my repo altogether and start over again? Sorry I'm > such a GH dunce, it's just not intuitive to me. > > Rob... > > On Tuesday, January 11, 2022 at 6:19:54 PM UTC-5 tbp1...@gmail.com wrote: > >> I use Git Extensions on Windows, and after checking out devel, ran the >> *Pull/Fetch* command, which I imagine is (behind the scene) the same >> command as what you did. You do have to make sure you are pulling from >> Upstream (the Leo git repo) and not Origin (your clone, if you've got >> one). I don't know what state master is in, but 6.6b1 is not the current >> version in devel. Here's what I have right now: >> >> Leo 6.6b2-devel, devel branch, build bdd9ba7442 >> 2022-01-10 17:30:14 -0500 >> >> >> On Tuesday, January 11, 2022 at 5:51:51 PM UTC-5 Rob wrote: >> >>> I switched to the `Master` branch in GitHub for Windows and `fetched`. >>> Leo opens as before showing Leo 6.6b1, master branch, build 383d6776d1. >>> >>> I guess problem solved, just not sure why the devel branch doesn't work, >>> though. >>> >>> Rob... >>> >>> On Tuesday, January 11, 2022 at 5:40:16 PM UTC-5 Rob wrote: >>> >>>> Hmm, how did you 'fetch' it? I did what I always do, from my repo CLI, >>>> I type `git pull` and update my devel branch. I also tried 'fetching' >>>> using >>>> GitHub for Windows. What else should I try? >>>> >>>> Rob... >>>> >>>> On Tuesday, January 11, 2022 at 5:36:31 PM UTC-5 tbp1...@gmail.com >>>> wrote: >>>> >>>>> I got that too, but it turned out that it wasn't the latest devel >>>>> branch, but only the latest zip of 6.6b1 that Github was offering. When >>>>> I >>>>> fetched the actual latest using git yesterday (not the zip file), which >>>>> was >>>>> some version of 6.6b2, that error had gone away. >>>>> >>>>> On Tuesday, January 11, 2022 at 5:26:23 PM UTC-5 Rob wrote: >>>>> >>>>>> After pulling in the latest devel branch, I get this: >>>>>> ~~~ >>>>>> 'type' object is not subscriptable >>>>>> >>>>>> *** Leo could not be started *** >>>>>> Please verify you've installed the required dependencies: >>>>>> https://leoeditor.com/installing.html >>>>>> ~~~ >>>>>> >>>>>> Before posting as an issue on GitHub, anyone else seeing this or know >>>>>> why Leo won't start? >>>>>> >>>>>> Rob... >>>>>> >>>>> -- 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/5fb9ef17-d28b-4e97-8f9d-750855e45e72n%40googlegroups.com.
