File tree Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change 11# Docker
22
3- The OSF angular project uses a docker image to simplify that developer process.
3+ The OSF angular project uses a docker image to simplify the developer process.
44
55### Volumes
66
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ To contribute to this repository, follow these steps:
2222
23231 . ** Fork the Repository**
2424
25- - Go to the main repository page on GitHub.
25+ - Go to the main repository page on GitHub [ OSF Angular Project ] ( https://github.com/CenterForOpenScience/angular-osf ) .
2626 - Click the ** Fork** button (top-right corner).
2727 - This creates a copy of the repository under your GitHub account.
2828
@@ -51,9 +51,13 @@ To contribute to this repository, follow these steps:
5151 ```
5252
53536 . ** Open a Pull Request**
54- - Go to the main repository on GitHub.
54+ - Go to the main repository page on GitHub [ OSF Angular Project ] ( https://github.com/CenterForOpenScience/angular-osf ) .
5555 - Click ** New Pull Request** .
56- - Select your fork and branch, then create the PR against the ` main ` branch of the main repo.
56+ - Select your fork and branch, then create the PR against the appropriate branch of the main repo.
57+ - A pre-determined ` feature ` branch (standard OSF development cycle)
58+ - The ` active PB&S ` branch (standard OSF bug fix cycle)
59+ - ` develop ` (used by internal OSF release engineers for releases to the testing environment)
60+ - ` main ` (used by internal OSF release engineers to push tested (QA and UAT) code to production)
5761
5862---
5963
You can’t perform that action at this time.
0 commit comments