Skip to content

Instantly share code, notes, and snippets.

@bschilder
Last active December 5, 2023 15:58
Show Gist options
  • Save bschilder/a755d122e023a307a35d17ecb381a3a2 to your computer and use it in GitHub Desktop.
Save bschilder/a755d122e023a307a35d17ecb381a3a2 to your computer and use it in GitHub Desktop.
Merge changes from upstream repo when on a forked repo
# Add the remote, call it "upstream":
git remote add upstream https://github.com/scverse/anndataR.git

# Fetch all the branches of that remote into remote-tracking branches
git fetch upstream

# Make sure that you're on your master branch:
git checkout upstream/main

# Rewrite your master branch so that any commits of yours that
# aren't already in upstream/master are replayed on top of that
# other branch:
git rebase upstream/main


# If you've rebased your branch onto upstream/master you may need to force the push in order to push it to your own forked repository on GitHub
git push -f origin main

Resources

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment