Hello,
I have recently started a project with a couple of friends, and we are using GitHub as our go-to-software to get assets, progress from eachother, etc.
There is one problem though, if me and my friends are editing the same Landscape (either sculpt it, smoothen it, paint it, basically everything that is altering the landscape shape/color), we will have conflicts when we commit and the changes are not merging but instead, making the edited landscape (by both sides) disappear completely when we update from “main branch”.
Can anyone help us figure this out? It’s ruining our project and we are stuck with this issue.
Thank you very much for your help in advance!
Here is a pic how the project looks after we both edited the landscape (me from my end, and my friend from the other, then commiting on github and updating from the “main branch”, instead of the landscape merging together, it completely disappeared from both ends)