the maslowcnc master is triangular… the master branch in webcontrol is triangular. the maslowcnc repo was at version 1.26 with sone outstanding PR’s. The webcontrol firmware was at version 1.28 (triangular) and actively developed, so I’ve only used the webcontrol firmware as the source. Holey is only a webcontrol thing (version 51.xx) and there was some chatter a while back about folding them together, but that hasn’t happened yet.
As one who was newly initiated to the github scene, I found github desktop to be very useful when actually working with the files. You start by creating a github account from a web page. Once you are logged in online, you visit the github repository of interest and you click the fork button in the upper right hand corner. This creates your own copy in your account and your fork is listed in the original repository fork list. Then in github desktop, you clone repository and make a local copy. From there I open the repository in visual basic code and create a new branch based on the master and make the changes of interest. Once I have a useful change or several changes and it is at a good stopping point, I save those changes by committing them back to the repository trying to be descriptive about what those changes are in the commit title and note listing what the changes are and why they are useful. Committing the changes basically saves them in that branch as the current version on the local machine. Then by “pushing” them, they go to the branch in my fork of the repoository on the github server, effectively syncing them. When the changes are complete to accomplish the task, then you can do a pull request (PR) back to the original repository master branch (or whatever branch you select) where you describe the useful changes and how to test them. You need one or more reviewers to verify and OK it and then your changes get “pulled” back in to the originating repository. Since webcontrolcnc firmware is a fork of maslowcncn firmware, changes from webcontrolcnc can be pull requested back to maslowcnc firmware, though they can likely go either way. Webcontrolcnc can merge changes from maslowcnc and pull request updates to maslowcnc, though if you look at the repository stats, with the recent activity on maslowcnc firmware, it was ahead, but is now quite a bit off:
18 changes in the holey firmware from the maslowcnc repository when it forked and then there are 21 changes it does not have. they are different. The master branch of webcontrolcnc, which is triangular, is now
4 commits behind the maslowcnc branch.
to keep your local branch up to date, you merge in changes from the master by selecting the master branch to merge into your branch when there are recent commits of changes that put it “ahead” of your branch. once you merge, commit, push, your repo is synced with your changes and the latest other changes. It makes the organization of monitoring and approving changes much simpler than trying to keep track with a spreadsheet. and the diff function to view two files side by side is super useful.