search

lnnrtwttkhn / version-control-book

Source code for the Version Control Book, a guide to Git for scientists
https://lennartwittkuhn.com/version-control-book/
Creative Commons Attribution Share Alike 4.0 International
6 stars 2 forks source link

add info to git conifg and / or branches chapter on how to reconcile branches and what advantages / disadvantages are #209

Open lnnrtwttkhn opened 1 month ago

lnnrtwttkhn commented 1 month ago

This is the message that often comes up:

✗ 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.