From b4b17b8b19ab62472f73dadc15320afb9bd880fd Mon Sep 17 00:00:00 2001 From: Alin Marin Elena Date: Thu, 8 Aug 2024 08:29:03 +0100 Subject: [PATCH] Update contributing.md Co-authored-by: ElliottKasoar <45317199+ElliottKasoar@users.noreply.github.com> --- contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing.md b/contributing.md index caf49f8d..11e9bb1e 100644 --- a/contributing.md +++ b/contributing.md @@ -168,7 +168,7 @@ the differences between merge and rebase $ git remote add upstream git@github.com: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