Skip to main content

Godot and Git (part 7): Tips for merging scenes and team collaboration

Submitted by David Snopek on Thursday, 2020-11-19 @ 10:40pm

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

In this part, we talk about merging Godot scene files (*.tscn), learning about the format, how to resolve merge conflicts, and some tips for team collaboration and avoiding merge conflicts in the first place.

This course covers BOTH the command-line and GUI for using Git, although, in this part we will only look at command-line in order to save time - the commands are the same as the last part, so if you want to see how to do them in the GUI, please watch part 6.

This video 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

Ready for more? See the in this course!

Level:
Beginner

All the tutorials in this course

Subscribe!

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

* indicates required

Comments

Submitted by booker judi on Wednesday, 2021-04-14 @ 10:54pm Permalink

I blog frequently and I truly thank you for your information. This
article has really peaked my interest. I'm going
to bookmark your site and keep checking for new details about once a
week. I opted in for your Feed aas well.

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.
CAPTCHA
This question is for testing whether or not you are a human visitor and to prevent automated spam submissions.