Branching and merging workflows for individual developers and teams, including pull requests, conflict resolution and maintaining a clean history.
Topics covered
Git Flow; DiffTool and MergeTool; local and remote branches; merging; pull requests; team branching strategies; intermediate Git operations and conflict resolution.
