@joshua has a fork of the firmware that contains holey calibration work. I have a fork that contains optical calibration work. I would like to make modifications to @joshua’s branch but I can’t “fork” it into my repo because I already have a fork of the firmware.
Without creating another repository, how can I get a copy of @joshua’s firmware and work on it and still stay connected to the maslowcnc/firmware?
The only thing I came up with is have someone create a branch in maslowcnc/firmware called holeyfirmware and have @joshua merge his branch into it. Then, because I have a fork of maslowcnc/firmware, I should be able to work on his branch. Would this work?
One thing that needs to be done is to update the holey calibration’s firmware to match the work on the master… it’s ~20 commits behind at the moment (e.g., missing the eeprom work, etc.)
I don’t think so. I believe I have merged all updates in, unless you guys have been really productive in the last week.
It would seem like branches are the appropriate solution here. At some point, I have found that there is quite a bit more flexibility if you actually download git, and use the software outside of GitHub.
Well, who the **** knows what I was working on today because even my manually created fork of @joshua’s fork (without connection to maslowcnc/firmware) has the changes. I’ll have to check the other computer and see what’s going on.
Regardless, I can’t directly edit and submit a PR to @joshua’s branch because I can’t fork it as I already have a fork of maslowcnc/firmware… correct?
create a new local path that is different from your own normal path. Here, I created the local path above for a fork of @Joshua’s repo.
To go further, you’ll really want to start using branches for working on things in your local repos. If I were you, I would checkout ‘master’ in your local madgrizzle/Firmware repo in GitHub Desktop and create a branch from it, named to describe the end you intend for this task - something like ‘merge-into-joshua’. Ditto in the schmittrjoshc/Firmware local repo - ‘merge-from-madgrizzle’. Checkout the source repo/branch, copy some files, checkout the destination repo/branch and paste the files, then look at the ‘Changes’ list in the destination. Use branches in the destination to make smaller groups of changes, to make understanding the scope easier and selective rollback possible.