search

UMCarpentries / intro-curriculum-r

Custom curriculum for teaching R, the Unix Shell, & Git with an integrated workflow and reproducible research practices.
https://umcarpentries.org/intro-curriculum-r/
Other
9 stars 12 forks source link

Set `git config pull.rebase` at beginning along with other config #182

Open kelly-sovacool opened 1 year ago

kelly-sovacool commented 1 year ago

If you get a warning message when you ran git pull regarding how to reconcile divergent messages, you can run this to let git merge automatically:

git config --global pull.rebase false

Thanks for catching this @emarpaz!