Kategori: Ukategorisert
-
Automatic handling of Godot .tscn merge conflicts in git

Note: This is my personal fix for this issue. If you have any better ideas for tscn conflict resolution please let me know:) As I’ve been collaborating with some friends in Godot projects I’ve come to find the painful experience of git automatically merging the contents of .tscn files. To solve this I eventually landed…
