Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Issue with pull from upstream #1290

Discussion options

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:

image

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

You must be logged in to vote

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

Replies: 1 comment

Comment options

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

You must be logged in to vote
0 replies
Answer selected by javadzarezadeh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
question Further information is requested

AltStyle によって変換されたページ (->オリジナル) /