Skip to main content

Godot and Git (part 6): 3-way Merge and Merge Conflicts

Submitted by David Snopek on Monday, 2020-09-21 @ 10:36pm

This tutorial is part of the Godot and Git course. See the if you haven't already!

In this part, we talk about what a 3-way merge is, and practice doing a 3-way merge on a GDScript file, both with and without a merge conflict.

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):

Ready for more? See the in this course!


All the tutorials in this course


Subscribe to get an email when new articles or videos are posted on!

* indicates required


Add new comment
The content of this field is kept private and will not be shown publicly.

Plain text

  • No HTML tags allowed.
  • Lines and paragraphs break automatically.
  • Web page addresses and email addresses turn into links automatically.
This question is for testing whether or not you are a human visitor and to prevent automated spam submissions.