Git - "fatal: Need to specify how to reconcile divergent branches."

Last updated on 

The error

You receive an error when pulling from upstream: "fatal: Need to specify how to reconcile divergent branches.

This was due to a change with Git version 2.34.1 and later in how git pull is configured that affects users attempting to pull in new containers built in 2025.

Solution:

If you see this message, you were missed when existing users' configuration files were updated.

Run the following command in your jupyter terminal:

git config pull.rebase false

Then run your pull command, which should work.

git pull --no-edit upstream master

If you continue to have problems or have any concerns, contact the sysadmin.

Need more information or help? Reach out to us at 📧 jcwdw@missouri.edu