As the title says, myself and a few friends have been building some small projects to learn Unreal and VR development, but we’re having a ton of problems with Git. For example, even creating a new blueprint class and then trying to commit it will give us merge conflicts, even though the class is brand new and shouldn’t be conflicting with anything.
Do the rest of you use Git? Are there better options out there, or do we just need to get used to the nuances of using Git with Unreal?
do you guys use command line, or an interface like SourceTree ?
We’ve tried both using the integrated UE4 git plugin and the command line. Both seem to have problems. It seems like any change of UE4 assets cause massive merge conflicts, even if there are no real conflicts.
We use perforce at our studio… been having pretty good results with it.
We use svn. The main issue that is sounds like you are struggling with are conflicts of binary fills. I’m not sure if any version control supports merging conflicts of those but I know svn does not. We workaround this by just making sure that only one person is making changes to a binary file.