Collaborating with Git | Godot Engine | Page 1

exotic wyvern Jan 19, 2025, 3:15 AM

#

Hello all!
I'm new to Godot. Very new. I'm learning alongside a friend of mine and we are collaborating with Git.

My only question is, if I were to make a change in one part of the project, and he makes a change in another part of the project, how would we ensure that it isn't overwriting the changes of one person's commit to commit the other person's?

I feel like there's very much an easy solution here, I know this is a less godot centered question but I imagine there's at least some people in here who would have some idea of what I'm asking

exotic wyvern Jan 19, 2025, 3:33 AM

#

I believe the answer may be branches but we shall see

raw sail Jan 19, 2025, 3:48 AM

#

In general, yes I think the answer would be branches. However, you'd still want to avoid having your branches touch the same scene files and such, because then you'll have to resolve merge conflicts once you go to merge the branches into the main branch

exotic wyvern Jan 19, 2025, 4:04 AM

#

raw sail In general, yes I think the answer would be branches. However, you'd still want ...

So as long as we don't fuck with the scene the other is working on everthing should be fine?

#

i.e. If I were to mess with a player scene the other should be working on level scene

raw sail Jan 19, 2025, 4:05 AM

#

Yep I think that should be all right

dim plover Mar 13, 2025, 12:10 PM

#

Idk if I should ask a different question here we are also using git but my friends working on the map and I for the life of me cannot get the map to show on my end

#Collaborating with Git