Git Workflows & Merge Conflicts — Roadmap Step & Resources
Feature branching, Gitflow and resolving merge conflicts confidently
- Level: beginner
- Estimated time: 1 days
- Roadmap: Next.js Full Stack
Before this step
Interview questions
- How do you resolve a merge conflict?
Study resources
- Comparing Git Workflows (Article) — Atlassian's widely-cited comparison of centralized, feature-branch, Gitflow and forking workflows.
- Gitflow Workflow (Article) — Atlassian's dedicated deep-dive into the Gitflow branching model specifically.
- Feature Branch Workflow (Article) — Atlassian's guide detailing continuous integration with feature branches.
Part of
- Developer Tools & Version Control — section
- Next.js Full Stack roadmap — the full learning path