-
Notifications
You must be signed in to change notification settings - Fork 362
Submitting
Polydynamical edited this page Nov 13, 2021
·
9 revisions
- https://www.youtube.com/watch?v=cz1MuH1rtR8
- https://www.youtube.com/watch?v=xzBo49ZjJuU
- https://www.youtube.com/watch?v=VRwSynCgGX4
- When creating a branch to work on masks DO NOT create them from a previous branch that you have a PR for. Create a new branch from the master branch. This will prevent issues where your new PRs will contain mask changes from previous PRs
- keep master synced with comma's branch by rebasing before creating a new branch so it's using the most recent version of master
- you'll want to create separate branches for each batch of masks you're submitting in your PRs, don't put them into your master branch because if it gets out of sync with comma's master branch you'll get conflicts eventually and will be a pain to fix.
Here's what I typically do when working on a new batch: Do this first if you haven't setup the remote upstream: git remote add upstream https://github.com/commaai/comma10k.git git fetch upstream
- Rebase my master branch with comma's: git checkout master git pull upstream master git push
- Create a new branch from the synced master git checkout -b myNewBatch
- Make my changes to the files in this branch
- Commit and push those changes to my repo git add . git commit -m "xxx - yyy fixes" git push
- Create a PR into Comma's repo from github.com
https://docs.google.com/document/d/1gO65cVNYTvvhwhrbx3-UdZ5DvoqROfvu1LpdEDto9AM/edit