How to solve conflicts in a .tscn file using git (gitlab) ?

:information_source: Attention Topic was automatically imported from the old Question2Answer platform.
:bust_in_silhouette: Asked By auloma

Hi everyone,
With my classmates we are using gitlab to put in common our modifications to our Godot project.
The problem is that when we modify the same scene.tscn, we can’t solve conflicts. That’s very annoying because we can’t work together on the same computer, and we have to work on different functionalities on the same scene.

Thank you for your help !

:bust_in_silhouette: Reply From: Calinou

.tscn files aren’t really designed to have solvable merge conflicts. Instead, split your project into more smaller scenes.

You can right-click a node in the Scene tree dock and choose Save Branch As Scene to save the node and its children to a separate scene file. It will be replaced automatically by an instanced scene.