Git Push Pull Help

If you are having problems pushing commits from Jetstream after you have modified you repo on Github.com or an another computer, you may need to update your git preferences on your Jetstream instance.

Symptom

You try to push and get an error saying that you need to pull:

Then you try to pull, but you get another error:

Fix

Open the Linux terminal and type:

git config --global pull.rebase false

Then go back to RStudio, pull, and then push.