About branches
Branches allow you to develop features, fix bugs, or safely experiment with new ideas in a contained area of your repository.
You always create a branch from an existing branch. Typically, you might create a new branch from the default branch of your repository. You can then work on this new branch in isolation from changes that other people are making to the repository. A branch you create to build a feature is commonly referred to as a feature branch or topic branch. For more information, see "Creating and deleting branches within your repository."
You can also use a branch to publish a Páginas de GitHub site. For more information, see "About Páginas de GitHub."
You must have write access to a repository to create a branch, open a pull request, or delete and restore branches in a pull request. For more information, see "Access permissions on GitHub."
About the default branch
Cuando creas un repositorio con contenido en tu instancia de GitHub Enterprise Server, GitHub Enterprise Server crea el repositorio con una sola rama. Esta primera rama en el repositorio es la rama predeterminada. The default branch is the branch that GitHub displays when anyone visits your repository. The default branch is also the initial branch that Git checks out locally when someone clones the repository. A menos de que especifiques una rama diferente, la rama predeterminada en un repositorio será la rama base para las solicitudes de cambio nuevas y para las confirmaciones de código.
By default, GitHub Enterprise Server names the default branch main
in any new repository.
Puedes cambiar la rama predeterminada de un repositorio existente. Para obtener m� s informaciòn, consulta la secciòn "Cambiar la rama predeterminada".
Puedes configurar el nombre de la rama predeterminada para los repositorios nuevos. Para obtener más información, consulta las secciones "Administrar la rama predeterminada para tus repositorios", "Administrar el nombre de rama predeterminado para los repositorios de tu organización" y "Requerir políticas de administración de repositorios en tu empresa".
Working with branches
Once you're satisfied with your work, you can open a pull request to merge the changes in the current branch (the head branch) into another branch (the base branch). For more information, see "About pull requests."
After a pull request has been merged, or closed, you can delete the head branch as this is no longer needed. You must have write access in the repository to delete branches. You can't delete branches that are directly associated with open pull requests. For more information, see "Deleting and restoring branches in a pull request"
Si borras una rama de encabezado después de haber fusionado su solicitud de extracción, GitHub verificará cualquier solicitud de extracción abierta en el mismo repositorio que especifique la rama borrada como su rama base. GitHub actualiza automáticamente cualquier solicitud de extracción, cambiando su rama base a la rama base de la solicitud de extracción que se ha fusionado. The following diagrams illustrate this.
Here someone has created a branch called feature1
from the main
branch, and you've then created a branch called feature2
from feature1
. There are open pull requests for both branches. The arrows indicate the current base branch for each pull request. At this point, feature1
is the base branch for feature2
. If the pull request for feature2
is merged now, the feature2
branch will be merged into feature1
.
In the next diagram, someone has merged the pull request for feature1
into the main
branch, and they have deleted the feature1
branch. As a result, GitHub has automatically retargeted the pull request for feature2
so that its base branch is now main
.
Now when you merge the feature2
pull request, it'll be merged into the main
branch.
Working with protected branches
Repository administrators can enable protections on a branch. If you're working on a branch that's protected, you won't be able to delete or force push to the branch. Repository administrators can additionally enable several other protected branch settings to enforce various workflows before a branch can be merged.
Note: If you're a repository administrator, you can merge pull requests on branches with branch protections enabled even if the pull request does not meet the requirements, unless branch protections have been set to "Include administrators."
To see if your pull request can be merged, look in the merge box at the bottom of the pull request's Conversation tab. For more information, see "About protected branches."
When a branch is protected:
- You won't be able to delete or force push to the branch.
- If required status checks are enabled on the branch, you won't be able to merge changes into the branch until all of the required CI tests pass. For more information, see "About status checks."
- If required pull request reviews are enabled on the branch, you won't be able to merge changes into the branch until all requirements in the pull request review policy have been met. For more information, see "Merging a pull request."
- If required review from a code owner is enabled on a branch, and a pull request modifies code that has an owner, a code owner must approve the pull request before it can be merged. For more information, see "About code owners."
- If required commit signing is enabled on a branch, you won't be able to push any commits to the branch that are not signed and verified. For more information, see "About commit signature verification" and "About protected branches."
- If you use GitHub's conflict editor to fix conflicts for a pull request that you created from a protected branch, GitHub helps you to create an alternative branch for the pull request, so that your resolution of the conflicts can be merged. For more information, see "Resolving a merge conflict on GitHub."
Further reading
- "About pull requests"
- "Branch" in the GitHub glossary
- "Branches in a Nutshell" in the Git documentation