Issue with pull from upstream

[javadzarezadeh]

First Check

• I added a very descriptive title here.
• I used the GitHub search to find a similar question and didn't find it.
• I searched in the documentation/README.
• I already searched in Google "How to do X" and didn't find any information.
• I already read and followed all the tutorial in the docs/README and didn't find an answer.

Commit to Help

• I commit to help with one of those options 👆

Example Code

git pull --no-commit upstream master

Description

After I try git pull --no-commit upstream master the terminal output would be a fatal error of:

After Googling my issue I found this, but since I don't have any experience with updating from an upstream, I don't know which procedure should I choose. Would you please help me through this?

Thank you.

Operating System

macOS

Operating System Details

Sonoma 14.5

Python Version

3.12.2

Additional Context

No response

[YuriiMotov]

Use

git fetch upstream master
git merge --no-commit --no-ff upstream/master

This will merge changes, but stop before commit so that you can check everything