this post was submitted on 15 Mar 2025
18 points (95.0% liked)

Godot

6449 readers
6 users here now

Welcome to the programming.dev Godot community!

This is a place where you can discuss about anything relating to the Godot game engine. Feel free to ask questions, post tutorials, show off your godot game, etc.

Make sure to follow the Godot CoC while chatting

We have a matrix room that can be used for chatting with other members of the community here

Links

Other Communities

Rules

We have a four strike system in this community where you get warned the first time you break a rule, then given a week ban, then given a year ban, then a permanent ban. Certain actions may bypass this and go straight to permanent ban if severe enough and done with malicious intent

Wormhole

!roguelikedev@programming.dev

Credits

founded 2 years ago
MODERATORS
snowe@programming.dev
Ategon@programming.dev
Feyter@programming.dev
18
[Help Me] Workflow in team with Godot and Git - uid nightmare (jlai.lu)
submitted 4 days ago by AlexCamille@jlai.lu to c/godot@programming.dev
11 comments fedilink hide all child comments
 

Hello everybody!

I have recently started to make small game jam project with friends using Godot. I previously had some experiences with it, but only on solo dev project. I really like it. I recommended it, and we used it on several project with git the following way: we split our project in a lot of small scene to avoid conflict, and everybody works on their branch. We communicate to be sure nobody is working on the same scene.

Now we face problems that could mean the end of our godot usage as a team: After some commit (I'll say the first one after a fetch), the uid of some random scene changes and will cause merge conflicts. It seems that there is no logic to it, and it leads to a lot of time lost, sometimes file corruption. The faulty commits are then extremely hard to track. Today we worked with godot 4.4 and it was even more painful. We lost a lot of our project.

I really want to continue to work with Godot, but I should say that my teammates were talking about learning other engine (and I want to be clear: the git conflict is our only issue; but we took half our coding time resolving conflict, reverting commit, cherry picking, etc. just so the master branch has something working on it)

If I have to choose between believing that our workflow sucks or that it is impossible to work with Godot in a team, I'm 99% on our skill issue. If you have any solution or advice, thank you! If you work on a team and you never had those kind of problem, that is also good to know!

Best

you are viewing a single comment's thread
view the rest of the comments
[–] Jayjader@jlai.lu 1 points 4 days ago (1 children)

The uids' re-generation might be faulty, as they're new to 4.4.

In theory the problem can still arise without using uids - it certainly has for me in the past, working on a godot 4.2 project on 2 separate machines. Godot imported the same things twice, once independently on each machine, and so generated different ids for them. From what I can tell the biggest error/mistake on my part was opening the project in the godot editor before pulling the newest commits.

The best approach I've found so far has been to be very conscious about when a new scene is created, and to similarly be very mindful when merging git branches.

If a scene was added, but not its .uid file (or a resource but not its .uid or .import) then whoever pulls the code and then opens their 4.4 editor will generate new uids on their end. This generation probably updates the scattered .tscn files that participate in and/or use the newly added scene.

Sadly I don't have an exact method or workflow to recommend beyond trying to do git pulls/fetches before opening the editor, especially when new scenes, nodes, or resources have been added to the project.

[–] fum@lemmy.world 2 points 4 days ago (1 children)

I thought the whole point of the new UID feature is 4.4 was to help with git workflows?

[–] Jayjader@jlai.lu 2 points 4 days ago

I think that's the point of it. I also don't think they've encountered every possible bug with it yet, so it might take a while before all the kinks get ironed out.

The big "win" that these uids seem to already bring is unicity of id for resources - the problems I've had in previous editions of Godot were of the form where an asset's locally generated id doesn't match up in the various scenes that use it.