![# Unity generated files
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
Unity .gitignore Or use my Unity .gitignore @ bit.ly/unity-git](https://image.slidesharecdn.com/git-and-unity-170311223228/75/Git-and-Unity-13-2048.jpg)
![Unity SmartMerge
SmartMerge guide @ bit.ly/unity-git
$ git mergetool
Merging:
Assets/Scenes/GameOver.unity
…
Assets/Scenes/GameOver.unity seems unchanged.
Was the merge successful [y/n]?
ignore this
y](https://image.slidesharecdn.com/git-and-unity-170311223228/75/Git-and-Unity-72-2048.jpg)
![Unity SmartMerge
[mergetool “unity_yaml”]
cmd = UnityYAMLMerge merge -p
$BASE $REMOTE $LOCAL $MERGED
trustExitCode = false
keepTemporaries = true
keepBackup = false
[merge]
tool = unity_yaml
SmartMerge guide @ bit.ly/unity-git](https://image.slidesharecdn.com/git-and-unity-170311223228/75/Git-and-Unity-73-2048.jpg)
More Related Content
What's hot (20)
Viewers also liked (20)
Similar to Git and Unity (20)
Recently uploaded (20)
Git and Unity
- 1. Git and Unity TIM PETTERSEN • SENIOR DEVELOPER • ATLASSIAN • @KANNONBOY
- 2. GIT AND UNITY WHY GIT? GAME ASSETS BRANCHING AND MERGING Git and Unity BUILD AUTOMATION INTERMEZZO
- 4. Why ?
- 8. Chapter Title Here Spilled beer on hard drive? Malicious vandalism? Data center hit by meteor? Accidental branch deletion? No biggie! We’re on rm -rf in the wrong directory?
- 9. shader-upgrade stable master branch isolated feature work master Branching workflow
- 10. Peer pressure 92% 8% Bitbucket repositories, Git vs Hg
- 11. &
- 13. # Unity generated files /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ /[Bb]uild/ /[Bb]uilds/ /Assets/AssetStoreTools* Unity .gitignore Or use my Unity .gitignore @ bit.ly/unity-git
- 14. # Code IDE generated files *.sln .idea/ .consulo/ *.csproj *.unityproj *.suo … Unity .gitignore Or use my Unity .gitignore @ bit.ly/unity-git
- 15. # Build artifacts *.exe *.apk *.log *.zip *.app … Unity .gitignore Or use my Unity .gitignore @ bit.ly/unity-git
- 16. # OS special files Thumbs.db ehthumbs.db $RECYCLE.BIN/ *.lnk .DS_Store … Unity .gitignore Or use my Unity .gitignore @ bit.ly/unity-git
- 17. Unity .gitignore Or use my Unity .gitignore @ bit.ly/unity-git
- 18. has a small had a large problem
- 19. data model
- 21. master 98ca9.. bab1e.. fad3d.. 434bb..tree bab1e..parent Tim P <kannonboy@…> 1455209277 -0800committer Tim P <kannonboy@…> 1455209277 -0800author My life is my commit message. git cat-file -p 98ca9$
- 22. git cat-file -p 434bb ace23..100644 blob .gitignore dbdbd..100644 blob .gitattributes a0bc3..040000 tree Assets 33d33..040000 tree ProjectSettings b1de7..100755 blob build.sh 7011e..100755 blob README.md typefilemode SHA-1 master 98ca9.. bab1e.. fad3d.. $ 434bb..
- 27. Photo: Le Monde en Vidéo
- 28. Photo: Le Monde en Vidéo
- 29. Photo: Le Monde en Vidéo
- 30. Git LFS! Git LOB! Photo: Le Monde en Vidéo
- 31. ! Photo: Le Monde en Vidéo Git LFS!
- 32. (Large File Storage) Git LFS
- 37. git pull$ LFS store Git host ☞ ☞ ☞ dabad.. 98ca9.. bab1e.. fad3d.. 86753.. 434bb.. 4749d.. bdd12.. 778aa..
- 38. git pull$ LFS store Git host ☞ ☞ ☞ dabad.. 98ca9.. bab1e.. fad3d.. 86753.. 434bb.. 4749d.. bdd12.. 778aa..
- 39. git checkout bab1e$ LFS store Git host ☞ ☞ ☞ dabad.. 98ca9.. bab1e.. fad3d.. 86753.. 434bb.. 4749d.. bdd12.. 778aa.. HEAD
- 40. https://git-lfs.github.com/spec/v1version sha256:325ddfb…oid 29342295size git cat-file -p 4749d$ ☞ ☞ ☞ dabad.. 98ca9.. bab1e.. fad3d.. 86753.. 434bb.. 4749d.. bdd12.. 778aa..
- 41. $ brew install git-lfs $ git lfs install
- 42. $ git lfs track “*.png” $ cat .gitattributes *.png filter=lfs diff=lfs merge=lfs -text
- 43. SourceTree
- 44. What to track? Yep Probably Nah SFX Music Textures Spritesheets FMV Code Fonts Materials Text Meshes Animations Scenes if they’re big or change frequently big stuff Or use my Unity .gitattributes @ bit.ly/unity-git
- 45. # Git $ git pull $ git checkout $ git add $ git commit $ git push # Git LFS $ git pull $ git checkout $ git add $ git commit $ git push
- 46. elephant.png Work tree dev .git/lfs/objects Clean filter (git-lfs clean) ☞ Index elephant.png $ .git/objects git add
- 47. $ dev .git/lfs/objects Smudge filter (git-lfs smudge) Work tree elephant.png ☞ Commit tree elephant.png .git/objects LFS Store git checkout
- 48. $ git push Git LFS: (12 of 13 files, 1 skipped) 168.75 MB / 180.87 MB, 12.12 skipped Counting objects: 22, done. ...
- 49. $ git pull remote: Counting objects: 3, done. ... Downloading elephant.png (50.79 MB) ... 1 file changed, 2 insertions(+)
- 50. © Disney Fetch the bare necessitiesFetch the bare necessities
- 51. © Disney # don’t pull down cutscene videos $ git lfs fetch --exclude ‘Assets/Video/**’ # for an audio engineer $ git lfs fetch --include ‘Assets/Sounds/**’ $ git config lfs.fetchexclude ‘Assets/Video/**’ $ git config lfs.fetchinclude ‘Assets/Sounds/**’ Fetch the bare necessitiesFetch the bare necessities
- 52. Build automation
- 53. Comic: Randall Munroe http://xkcd.com/303/ #1
- 55. GAME BUILDS? Y’ALL GOT ANY MORE OF THEMY’ALL GOT ANY MORE OF THEM GAME BUILDS?#3
- 57. #5 REDACTED
- 58. cloud build
- 63. What about the bucket?
- 67. shader-upgrade stable master branch isolated feature work master Branching workflow
- 68. CONFLICT (content): Merge conflict in Assets/Scenes/GameOver.unity Automatic merge failed; fix conflicts and then commit the result. Merge conflicts $ Auto-merging Assets/Scenes/GameOver.unity git merge feature/endgame-spiceup
- 69. Merge conflicts git rebase master CONFLICT… CONFLICT… CONFLICT… git stash pop git pull $ $ $
- 71. $ git merge feature/endgame-spiceup Auto-merging Assets/Scenes/GameOver.unity CONFLICT (content): Merge conflict in Assets/Scenes/GameOver.unity Automatic merge failed; fix conflicts and then commit the result. Unity SmartMerge SmartMerge guide @ bit.ly/unity-git
- 72. Unity SmartMerge SmartMerge guide @ bit.ly/unity-git $ git mergetool Merging: Assets/Scenes/GameOver.unity … Assets/Scenes/GameOver.unity seems unchanged. Was the merge successful [y/n]? ignore this y
- 73. Unity SmartMerge [mergetool “unity_yaml”] cmd = UnityYAMLMerge merge -p $BASE $REMOTE $LOCAL $MERGED trustExitCode = false keepTemporaries = true keepBackup = false [merge] tool = unity_yaml SmartMerge guide @ bit.ly/unity-git
- 74. bit.ly/unity-git Unity + Git config go.atlassian.com/bitbucket-unity Bitbucket ❤ Unity go.atlassian.com/git-lfs Git LFS bitbucket.org Bitbucket Cloud Looking for more? For occasional Git, JIRA & Bitbucket trivia @kannonboy
- 75. Migrating to Git LFS ☞
- 76. Migrating to Git LFS ☞
- 77. 98ca9.. bab1e.. fad3d.. ☞ 100mb 150mb 150mb!?!? $ git lfs track “*.obj”
- 78. git filter-branch $ git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch elephant.obj’ --prune-empty --tag-name-filter cat -- --all DON’T DO THIS!
- 79. $ git filter—branch --prune-empty --tree-filter ' git config -f .gitconfig lfs.url “https://bitbucket.example.com/team/repo.git” git lfs track "*.obj" git add .gitattributes .gitconfig for file in $(git ls-files | xargs git check-attr filter | grep "filter: lfs" | sed -r "s/(.*): filter: lfs/1/"); do git rm -f --cached ${file} git add ${file} done' --tag-name-filter cat -- --all DON’T DO THIS EITHER!
- 81. BFG Repo-Cleaner 10-720x faster than filter-branch built to kill history Git LFS support by @rtyley
- 82. $ git filter—branch --prune-empty --tree-filter ' git config -f .gitconfig lfs.url “https://bitbucket.example.com/team/repo.git” git lfs track "*.obj" git add .gitattributes .gitconfig for file in $(git ls-files | xargs git check-attr filter | grep "filter: lfs" | sed -r "s/(.*): filter: lfs/1/"); do git rm -f --cached ${file} git add ${file} done' --tag-name-filter cat -- --all DON’T DO THIS EITHER!
- 83. $ brew install bfg $ bfg —-convert-to-git-lfs “*.obj” --no-blob-protection
- 84. $ brew install bfg $ bfg —-convert-to-git-lfs “*.obj” --no-blob-protection $ bfg —-convert-to-git-lfs “*.png” --no-blob-protection
- 85. $ bfg —-convert-to-git-lfs “*.lfs.*” --no-blob-protection Another approach…
- 86. Coming from SVN / P4? go.atlassian.com/svn-to-git go.atlassian.com/p4-to-git