UMCarpentries / intro-curriculum-r

Custom curriculum for teaching R, the Unix Shell, & Git with an integrated workflow and reproducible research practices.

Home Page:https://umcarpentries.org/intro-curriculum-r/

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

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

kelly-sovacool opened this issue · comments

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!