Merging
Details around merging in Git
Index
Workflows
- Stacked diffs
- Splitting code changes
- Managing multiple Git branches and PRs
Tools
- Graphite
- Git GUIs
- Third party Git CLIs
- The best code review tools
Git
- Merge strategies
- Common errors
- Common Git concepts and questions
Source control management tools
- Phabricator
- The history of Phabricator
- Differential: Phabricator’s Code Review Application
- Diffusion: Phabricator’s Code Browsing and Repository Management
- Maniphest: Phabricator’s Task and Issue Tracker
- Herald: Phabricator’s Custom Notification and Automation Engine
- Phabricator vs Google's Critique
- Phabricator vs. GitHub
- Phabricator's CLI: Arcanist
- Stacked Diffs: Phabricator's Influence on Code Review Workflows
- Phabricator adoption and eventual deprecation
- The history of Phabricator
- Gerrit
- Sapling
Code repositories
- Monorepos
Best practices
- Code reviews