I am trying to put my unity3d project into GIT version control. I followed this video https://youtu.be/EQB-N-ClO9g and I achieved the same. But the problem I am facing is, if the scene size is 10MB or more the conflict details are not opening with my external tool Meld.
In my .gitattribute file I have marked the .unity , .prefab & .asset as binary.
Is there any size limitation to view the conflicts?
Hi Mike thanks for the input, I tried changing the max file size for both text and binary. Now my external tool opens but the problem which I am facing now is the conflicts are getting auto resolved using my local changes. Is there any settings which I am missing.
But when I tested with smaller scene size the conflicts are shown to me and I would pick the changes to get merged either form theirs or mine.
Hi Mike I have already changed my unity editor setting. The conflict are showing for small scene size. But if I try to simulate the conflict for large scene size (More than 10 MB) source tree is not showing the conflicts instead it is getting auto resolved using my local changes.
These are my setting which I have done for putting my unity project into version control.
a. unity Editor Setting - Version Control Mode = Visible Meta Files
b. unity Editor Setting - Asset Serialization Mode = Force Text
c. mergespecfile.txt include these lines
unity use "%programs%\Meld\Meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge
prefab use "%programs%\Meld\Meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge
# Default fallbacks for unknown files. First tool found is used.
# Meld Merge
* use "%programs%\Meld\Meld.exe" "%r" "%b" "%l" -o "%d" --auto-merge
Source Tree (Repo is in Bitbucket) :
Selectd Custom in the External Diff / Merge Tool dropdown.
Typed the path to UnityYAMLMerge in the Merge Command text field.
merge -p $BASE $REMOTE $LOCAL $MERGED in the Arguments text field.
initialized the project with GIT-LFS
screen shot attached.
Finally...After a long struggle of 2 to 3 weeks. Implemented version control for unity3d project.
Meld Tool was not able to handle large files and we tried with few other tools like diffmerge, kdiff3 nothing worked.
When we tried with beyond compare tool it worked for us. In addition to this tool change, we made changes to .gitattribute file by removing the .unity entry as suggested by this link http://en.joysword.com/posts/2016/03/setting_up_github_for_unity_projects/
(Warning: It is not recommended to use LFS to manage
.unity scene files, otherwise you will be forced to have only one person working on a scene at all times)
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot