Recommending git pull over git fetch && git rebase might be slightly easier for students. In our application with a single branch and two contributors, pull vs. rebase doesn't really matter very much.
If we do this, we'd need to include the one-time configuration of merge vs. rebase, otherwise students will get an error like this:
$ git pull
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
git version 2.39.0
Recommending
git pullovergit fetch && git rebasemight be slightly easier for students. In our application with a single branch and two contributors, pull vs. rebase doesn't really matter very much.If we do this, we'd need to include the one-time configuration of merge vs. rebase, otherwise students will get an error like this: