Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated gitflow instructions.

Browse Source
This commit is contained in:
Ross Thompson 2023-01-23 17:50:25 -06:00
parent e6e4c7957c
commit e2869925ac
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gitflow.txt
View File

@ -9,7 +9,7 @@
## except in compliance with the License, or, at your option, the Apache License version 2.0. You ## except in compliance with the License, or, at your option, the Apache License version 2.0. You
## may obtain a copy of the License at ## may obtain a copy of the License at
## ##
## https:##solderpad.org/licenses/SHL-2.1/ ## https://solderpad.org/licenses/SHL-2.1/
## ##
## Unless required by applicable law or agreed to in writing, any work distributed under the ## Unless required by applicable law or agreed to in writing, any work distributed under the
## License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, ## License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
@ -29,10 +29,17 @@ Once per sessiosn
Fetch upstream and sync fork Fetch upstream and sync fork
1. git fetch upstream 1. git fetch upstream
2. git push 2. git merge upstream/main
Create pull request Create pull request
1. gh pr create 1. git fetch upstream
2. Must include a title and strongly encourage a body message explaining your changes. 2. git merge upstream/main
3. Wait for pull request to be approved, rejected, or needs changes. 3. git push
4. Finish by fetching the upstream and pushing back to your fork. 4. gh pr create
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.
7. Finish by fetching the upstream and pushing back to your fork.
1. git fetch upstream
2. git merge upstream/main
3. git push