Skip to content

Commit

Permalink
Update contributing.md
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 517b09b commit b4b17b8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ the differences between merge and rebase
$ git remote add upstream [email protected]:stfc/janus-core.git
# get the changes to upstream since you started working on your issue
$ git fetch devel
# 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 rebase -i upstream/main
# resolve any conflicts
# push to your fork
Expand Down

0 comments on commit b4b17b8

Please sign in to comment.