spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add instructions for The Easy Way

master
Shane Smiskol 2021-03-28 09:01:21 -05:00
parent 4d18602750
commit efd0561c4b
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Forks.md

@ -73,4 +73,24 @@ Forks can change many of the fundamental pieces of openpilot software. Because o
- Don't use the car's Parking Assist parameters to drive at highway speed. Don't promote to other users. See medium article for more details: https://medium.com/@comma_ai/safer-control-of-steering-362f3526c9ab
*NOTE: To fork maintainers. Disabling or nerfing safety features may get you and your users banned from our servers. comma.ai strongly discourages the use of openpilot forks with safety code either missing or not fully meeting the requirements defined in [SAFETY.md](https://github.com/commaai/openpilot/blob/master/SAFETY.md).*
*NOTE: To fork maintainers. Disabling or nerfing safety features may get you and your users banned from our servers. comma.ai strongly discourages the use of openpilot forks with safety code either missing or not fully meeting the requirements defined in [SAFETY.md](https://github.com/commaai/openpilot/blob/master/SAFETY.md).*
# Fork Management
## How do I pull branches from multiple forks since GitHub only allows one fork per origin repo?
Instead of forking multiple fork repositories based on [commaai/openpilot](/commaai/openpilot), you can choose specific branches you want to bring over to your own repository from other fork maintainers.
There's an easy way to do this which only involves using the GitHub website, and a more involved way which requires a local clone of your own fork as well as executing a few Git commands.
### The Easy Way
This way takes advantage of GitHub's edit & PR functionality.
- Find the branch you want to bring to your own fork from another user.
- Click on a file that isn't important to openpilot, such as the [README.md file](commaai/openpilot/blob/master/README.md) (click to use as an example).
- Then find the edit button above the file and click it. Make a small change and click the green "Propose changes" button.
- The name outlined in red is the new name of the branch on your repo you copied over:
![](https://i.imgur.com/EJVURTk.png)
- You can now go into your branches to rename it, and possibly revert the change to the file if you would like.
### The Git Way
So you issue these commands, and then these and you're done!