Cette version de GitHub Enterprise Server ne sera plus disponible le 2026-08-25. Les versions abandonnées ne sont pas prises en charge. Aucune publication de correctifs n’est effectuée, même pour les problèmes de sécurité critiques. Pour de meilleures performances, une sécurité améliorée et de nouvelles fonctionnalités dans GitHub Enterprise Server, consultez Overview du processus de mise à niveau. Pour obtenir de l’aide sur la mise à niveau, GitHub Support Entreprise.
Merge and close pull requests
Merge, revert, and close pull requests, resolve merge conflicts, and troubleshoot status checks effectively on GitHub.
Resolving a merge conflict on GitHub
Resolve simple merge conflicts directly on GitHub using the conflict editor or handle complex cases via the command line.
Resolving a merge conflict using the command line
Resolve merge conflicts using the command line by identifying conflicting changes, editing files, and committing resolutions.
Troubleshooting required status checks
Resolve common errors and unblock merging or pushing to protected branches by troubleshooting required status checks.
Merging a pull request
Merge pull requests into the upstream branch, choose merge methods, and meet repository requirements like reviews or status checks.
Merging a pull request with a merge queue
Use merge queues in GitHub to streamline pull request merging, ensure required checks pass, and manage queue operations effectively.
Automatically merging a pull request
Enable or disable auto-merge for pull requests to streamline your workflow and automatically merge changes once all requirements are met.
Reverting a pull request
Create a new pull request to revert a previously merged pull request and address merge conflicts if they arise.
Closing a pull request
Close a pull request without merging it to manage unnecessary changes or address alternative solutions in other branches.