Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: ElliottKasoar <[email protected]>
  • Loading branch information
alinelena and ElliottKasoar authored Aug 8, 2024
1 parent 332a2d6 commit b7c8f2c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Labels may be assigned to issues to help classify them. Examples
include,

- Testing: as in testing the water. This label shall be attached to things one may think to make one day
- Bug: anything in this is critical and shall be fixed asap.
- Design: queries or suggestions about the structure of the program.
- Enhancement: for issues relating to new features.
- Bug: something is not working as expected. We typically aim to fix these ASAP
- Design: queries or suggestions about the structure of the program
- Enhancement: adding or improving on features
- Documentation: adding or enhancing documentation

## Review
Expand Down Expand Up @@ -152,7 +152,7 @@ you can follow this routine,
$ git remote add upstream [email protected]:stfc/janus-core.git
# get the changes to upstream since you started working on your issue
$ git fetch upstream
# merge these changes into your branch (assuming you want to merge into the master branch on devel)
# merge these changes into your branch (assuming you want to merge into the main branch on devel)
$ git merge upstream/main
# resolve any conflicts
# push to your fork
Expand Down Expand Up @@ -208,7 +208,7 @@ When you need to sync your *fork* with *devel*, do the following,
``` sh
# get the latest commits from upstream
$ git fetch upstream
# ensure you are in the master branch of your fork
# ensure you are in the main branch of your fork
$ git checkout main
# merge your main branch into the main branch of upstream
$ git merge upstream/main
Expand Down

0 comments on commit b7c8f2c

Please sign in to comment.