Frecuentemente publicamos actualizaciones de nuestra documentación. Es posible que la traducción de esta página esté en curso. Para conocer la información más actual, visita la documentación en inglés. Si existe un problema con las traducciones en esta página, por favor infórmanos.
GitHub AE is currently under limited release. Please contact our Sales Team to find out more.

Merging an upstream repository into your fork

If you don't have push (write) access to an upstream repository, then you can pull commits from that repository into your own fork.

  1. Abre la TerminalTerminalGit Bash.
  2. Change the current working directory to your local project.
  3. Check out the branch you wish to merge to. Usually, you will merge into the default branch.
    $ git checkout DEFAULT_BRANCH_NAME
  4. Pull the desired branch from the upstream repository. This method will retain the commit history without modification.
    $ git pull https://nombre de host/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME
  5. If there are conflicts, resolve them. For more information, see "Addressing merge conflicts".
  6. Commit the merge.
  7. Review the changes and ensure they are satisfactory.
  8. Push the merge to your GitHub repository.
    $ git push origin DEFAULT_BRANCH_NAME

¿Te ayudó este documento?

Privacy policy

Help us make these docs great!

All GitHub docs are open source. See something that's wrong or unclear? Submit a pull request.

Make a contribution

O, learn how to contribute.