From 61a569b762acb442340e06400818e45acb4b72f4 Mon Sep 17 00:00:00 2001 From: Matthew Bourque Date: Thu, 21 Dec 2023 10:23:37 -0700 Subject: [PATCH] Updated docs to use rebasing instead of merging for keeping fork updated, as that is the preferred method --- .../style-guide/git-and-github-workflow.rst | 6 +++--- 1 file changed, 3 insertions(+), 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 index cb9522e92..001dc61a3 100644 --- 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: