Updated docs to use rebasing instead of merging for keeping fork upda…

…ted, as that is the preferred method
IMAP-Science-Operations-Center · Dec 21, 2023 · 61a569b · 61a569b
1 parent f951b5b
commit 61a569b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/docs/source/development-guide/style-guide/git-and-github-workflow.rst b/docs/source/development-guide/style-guide/git-and-github-workflow.rst
@@ -114,13 +114,13 @@ Keeping your fork updated
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 You can keep your personal fork up-to-date with the ``IMAP-Science-Operations-Center`` ``imap_processing`` repository by
-fetching and pulling the ``upstream`` remote:
+fetching and rebasing with the ``upstream`` remote:
 
 .. code-block:: bash
 
     git checkout dev
-    git fetch upstream dev
-    git pull upstream/dev
+    git fetch upstream
+    git rebase -i upstream/dev
 
 
 .. _collaborating-on-someone-elses-fork: