Recommandé
Contenu connexe
Similaire à Getting Git Right
Similaire à Getting Git Right (20)
Dernier
Dernier (20)
Getting Git Right
- 1. MANJUNATH | SOURCETREE DEVELOPER | @MANJUNATHIBS Getting Git Right with Bitbucket and Sourcetree
- 2. It’s the little details that are vital. Little things make big things happen. - John Wooden
- 3. Agenda Git Basics Stash, Patch and Reset Merge vs Rebase Unity + Sourcetree Migrate to Git Tracking history
- 4. Why ?
- 8. Chapter Title Here Spilled coffee 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. Peer pressure 92% 8% Bitbucket repositories, Git vs Hg
- 13. Ref -> Mutable pointer to an object Usually a commit refs/head/master -> commit fecd6578… Automatically store DAG For objects rooted at these refs Collection of Refs branches and tagsGit Repository
- 14. Ref -> Mutable pointer to an object Usually a commit refs/head/master -> commit fecd6578… Automatically store DAG For objects rooted at these refs Collection of Refs branches and tagsGit Repository
- 15. Ref -> Mutable pointer to an object Usually a commit refs/head/master -> commit fecd6578… Automatically store DAG For objects rooted at these refs Collection of Refs branches and tagsGit Repository
- 19. Branches are just Refs pointers into DAG of commitsGit Branch Lightweight Branching & Merging Can have any number of branches
- 20. Lightweight Branching & Merging Can have any number of branches Branches are just Refs pointers into DAG of commitsGit Branch
- 21. Tracking History Branches & Tags
- 22. shader-upgrade stable master branch isolated feature work master Branching workflow
- 25. Tags
- 26. trivia!
- 27. Which hashing algorithm does git use for generating commit IDs? SHA-1 MD5
- 28. The git DAG (which stores refs, trees and blobs) stands for.. Directed Acyclic Graph Data Agnostic Graph
- 29. The git checkout command can be used to check out an existing branch. True False
- 30. The git checkout command can be used to create a new branch. True False
- 31. The git 1.0.0 release was tagged in which year? 2005 2006
- 32. TIE-BREAKER
- 33. The first git commit message by Linus Torvalds reads: “Initial revision of git… …bye-bye Bitkeeper” …the information manager from hell”
- 34. Stash, Patch & Reset Getting around common mistakes
- 36. Wrong commit Pushed a commit on the wrong branch? Common mistakes Need to switch Can’t commit but want to switch to a new branch? Wrong branch Have local changes, but on the wrong branch
- 38. Same branch Works best only when you apply these changes on the same branch. Small - Big changes Acts as an archive for changes when you want to switch branch without having to commit or loose you changes when you switch Need to Switch? Stash Apply stash Whenever you are ready to resume work, apply your stash on the branch
- 39. Same branch Works best only when you apply these changes on the same branch. Small - Big changes Acts as an archive for changes when you want to switch branch without having to commit or loose you changes when you switch Need to Switch? Stash Apply stash Whenever you are ready to resume work, apply your stash on the branch
- 40. Same branch Works best only when you apply these changes on the same branch. Small - Big changes Acts as an archive for changes when you want to switch branch without having to commit or loose you changes when you switch Need to Switch? Stash Apply stash Whenever you are ready to resume work, apply your stash on the branch
- 41. Stash List
- 42. Switch branch Switch to another branch or create a new branch Small changes Ideal with small changes. Saved on disk as a diff file. Wrong branch? Patch Apply Patch Select and apply the patch in the new branch
- 43. Switch branch Switch to another branch or create a new branch Small changes Ideal with small changesWrong branch? Patch Apply Patch Select and apply the patch in the new branch
- 44. Switch branch Switch to another branch or create a new branch Small changes Ideal with small changesWrong branch? Patch Apply Patch Select and apply the patch in the new branch
- 47. Reset to commit You could also reset the branch to an earlier commit. This is a destructive action using reset. Reverse commit If you’ve already pushed the change to remote, just revert it and this will roll back changes with an extra commit. Uses revert Wrong commit? Reset If changes are local, you could just run clean and the branch will be pristine
- 48. Reset to commit You could also reset the branch to an earlier commit. This is a destructive action using reset. Reverse commit If you’ve already pushed the change to remote, just revert it and this will roll back changes with an extra commit. Uses revert Wrong commit? Reset If changes are local, you could just run clean and the branch will be pristine
- 49. Reset to commit You could also reset the branch to an earlier commit. This is a destructive action using reset. Reverse commit If you’ve already pushed the change to remote, just revert it and this will roll back changes with an extra commit. Uses revert Wrong commit? Reset If changes are local, you could just run clean and the branch will be pristine. Uses clean internally.
- 56. Merge vs Rebase Understanding how to bring two branches together
- 57. BEFORE MERGE AFTER MERGE
- 58. BEFORE REBASE AFTER REBASE
- 59. Unity + Sourcetree How using Sourcetree can make your life easier
- 63. Migrating to Git LFS ☞
- 64. 98ca9.. bab1e.. fad3d.. ☞ 100mb 150mb 150mb!?!? $ git lfs track “*.obj”
- 70. Unity Smart Merge Merge Command: Path to UnityYAMLMerge Arguments: merge -p $BASE $REMOTE $LOCAL $MERGED
- 74. What about the bucket ? https://bitbucket.org/repo/import/
- 75. LFS Store rich media and large data in your repos Code Aware Search Semantic search that ranks definitions first Issue tracker Use integrated issue tracker backed by JIRA and even a Trello board Pipelines Integrated CI/CD Bitbucket
- 78. Bitbucket Pipelines CI & CD right from within your repository
- 82. Build Status
- 84. 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? Git Documentation git-scm.com/documentation
- 86. MANJUNATH | @MANJUNATHIBS I know that was a lot ;) Thank you