GIT Lesson 18 – Conflicts | Dataplexa

Version Control (Git)

I. Beginner
1. Introduction 2. Why Git 3. Git vs VCS 4. Install Git 5. Configuration 6. Repositories 7. Workflow 8. Init & Clone 9. Status & Log 10. Add & Commit 11. Commit Messages 12. .gitignore 13. Undo Changes 14. Troubleshooting 15. Beginner Project
II. Intermediate
16. Branches 17. Merging 18. Conflicts 19. Rebasing 20. Tags 21. Git Stash 22. Remotes 23. Push & Pull 24. Fetch vs Pull 25. Workflows 26. Collaboration 27. Code Reviews 28. Pull Requests 29. Intermediate Project 30. Best Practices
III. Advanced
31. Advanced Rebasing 32. Git Hooks 33. Submodules 34. Monorepos 35. Release Management 36. CI/CD 37. Git Security 38. Enterprise Git 39. Mistakes 40. Wrap-Up
← Previous Course Index Next →