This tutorial is part of the Godot and Git course. See the previous part if you haven't already!
In this part, we make branches and merge them back into the parent branch, covering "fast forward" and "squash" merges, as well as how (and why) to use a merge request (MR) on GitLab.com.
This course covers BOTH the command-line and GUI for using Git.
This part is meant for absolute beginners who have gone through the previous parts, but otherwise don't have any previous experience with Git (or other version control systems).
The Git cheatsheet (with all the Git commands we run):
https://docs.google.com/document/d/1nB-W1NzazXxm68cQG1Kb3KXdX80LfpUp2HT181h25O8/edit?usp=sharing
And here's the Godot and GitLab CI course:
https://www.youtube.com/watch?v=4oUs4IV_Mj4&list=PLCBLMvLIundAOAiCvluBNuEA0-ea7_EDp&t=0s
Ready for more? See the next part in this course!
All the tutorials in this course
- Godot and Git (part 1): Why use Git (or any version control)?
- Godot and Git (part 2): Getting Started with Git
- Godot and Git (part 3): Traveling through History
- Godot and Git (part 4): Pushing your repository to GitLab.com
- Godot and Git (part 5): Simple branching and merging
- Godot and Git (part 6): 3-way Merge and Merge Conflicts
- Godot and Git (part 7): Tips for merging scenes and team collaboration
- Godot and Git (part 8): Git LFS and dealing with large assets
Comments