1e5372ac79
* Move category to top-level doc set * Move doc set to the top and update short title * Undo package-lock changes * updated hardcoded refs in tests * Update test * Fix hardcoded link in test Co-authored-by: Sarah Schneider <sarahs@github.com>
1.7 KiB
1.7 KiB
title, intro, redirect_from, versions
| title | intro | redirect_from | versions | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Dealing with non-fast-forward errors | Sometimes, Git can't make your change to a remote repository without losing commits. When this happens, your push is refused. |
|
|
If another person has pushed to the same branch as you, Git won't be able to push your changes:
$ git push origin main
> To https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git
> ! [rejected] main -> main (non-fast-forward)
> error: failed to push some refs to 'https://{% data variables.command_line.codeblock %}/<em>USERNAME</em>/<em>REPOSITORY</em>.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again. See the
> 'Note about fast-forwards' section of 'git push --help' for details.
You can fix this by fetching and merging the changes made on the remote branch with the changes that you have made locally:
$ git fetch origin
# Fetches updates made to an online repository
$ git merge origin <em>YOUR_BRANCH_NAME</em>
# Merges updates made online with your local work
Or, you can simply use git pull to perform both commands at once:
$ git pull origin <em>YOUR_BRANCH_NAME</em>
# Grabs online updates and merges them with your local work