Xavi/cvw
1
0
Fork 0
forked from Github_Repos/cvw
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/openhwgroup/cvw into dev

Browse Source
This commit is contained in:
David Harris 2023-01-25 06:03:02 -08:00
commit cbf45152fd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gitflow.txt
View File

@ -35,19 +35,16 @@ Once per session (This authorizes gh to use your github account)
3. Copy one-time code from terminal to browser 3. Copy one-time code from terminal to browser
Fetch upstream and sync fork Fetch upstream and sync fork
1. git fetch upstream # fetch the upstream openhwgroup/cvw into your local clone 1. git pull upstream main # fetch and merge the upstream openhwgroup/cvw into your local clone
2. git merge upstream/main # merge the upstream openhwgroup/cvw into your local clone 2. git push # pushes changes back to your fork. Now all three should be in sync
3. git push # pushes changes back to your fork. Now all three should be in sync
Create pull request Create pull request
1. git fetch upstream # fetch the upstream openhwgroup/cvw into your local clone 1. git pull upstream main # fetch and merge the upstream openhwgroup/cvw into your local clone
2. git merge upstream/main # merge the upstream openhwgroup/cvw into your local clone
3. git push # pushes changes back to your fork. Now all three should be in sync 3. git push # pushes changes back to your fork. Now all three should be in sync
4. gh pr create # Create a pull request. 4. gh pr create # Create a pull request.
5. Must include a title and strongly encourage a body message explaining your changes. 5. Must include a title and strongly encourage a body message explaining your changes.
6. Wait for pull request to be approved, rejected, or needs changes. 6. Wait for pull request to be approved, rejected, or needs changes.
7. Finish by fetching the upstream and pushing back to your fork. 7. Finish by fetching the upstream and pushing back to your fork.
1. git fetch upstream 1. git pull upstream main # fetch and merge the upstream openhwgroup/cvw into your local clone
2. git merge upstream/main # sync your clone with the upstream 3. git push # sync your fork with the upstream and clone
3. git push # sync your fork with the upstream and clone