Git'ing Started with Git

Transcript

1. Git’ing Started Build.com's Guide to Git & GitHub
2. The Set-up • Bash Completion - Install it • Aliases - Get some and some more • Global .gitignore - Have one • SourceTree - Install It (Mac | Win)
3. Clone the Parent Repository $ git clone --recursive \ https://github. com/buildcom/BuildStore Clone the SubModule Repository $ git submodule foreach --recursive \ git checkout master Cloning from GitHub
4. Practice Git TryGit: http://try.github.com/ Practice Branching: http://bit.ly/git-practice
5. Branching: Creating a new local $ git checkout -b IDS-5555 • -b is the same as --branch • Branches should be the tracker IDs ◦ Example: IDS-5551 • Epic branches should have the epic- prefix on the branch name ◦ Example: epic-IDS-5552 ◦ Provides an integration point ◦ Easier for multiple devs to work on ◦ Easy to bundle up multiple trackers
6. Branching: Submodules • If your tracker also requires changes to com, you’ll need to create a tracker branch • The com tracker branch should be named the same as the parent repo's branch $ cd com $ git checkout -b IDS-5555
7. Branch: Switching between locals $ git checkout YOUR_BRANCH_NAME
8. Branching: Checkout Remote $ git checkout -t origin/IDS-5555 • -t is the same as --track ◦ This creates the connection between your local branch titled IDS-5555 and the remote branch titled IDS-5555 on GitHub ◦ This makes git push & git pull work like magic.
9. Quick!! We need a hotfix stash
10. Save our current changes $ git stash save my-IDS-5555-wip $ git fetch origin $ git checkout -b IDS-911 origin/master
11. (mu)Stashin’ *Does Work* $ git add HOT_FIX_CHANGES $ git commit -m "IDS-911 fixin ur foo" $ git push -u origin IDS-911 *Open Pull Request on GitHub*
12. Okay, where was I? $ git checkout IDS-5555 $ git stash pop my-IDS-5555-wip
13. Pushing to Github $ git push -u origin IDS-5555 • -u is the same as --set-upstream ◦ Similar to --track when creating branches from remotes ◦ Tells your local repository that your local IDS-5555 branch is connected to remote's IDS-5555 branch ◦ git pull & git push => moar magic.
14. Time to Pull Request First, let’s make sure we’re current with the remote master branch with a quick rebase !!!Don't get burned by non-mergeable Pull Request!!!
15. Rebasing Master $ git checkout master $ git pull \ --recurse-submodules $ git checkout IDS-5555 $ git rebase master or without leaving your tracker branch $ git fetch origin $ git rebase origin/master
16. Not to fear, citizen. Mergetool is here. 1. Fire up mergetool with: $ git mergetool 2. Resolve conflicts 3. Complete merge with: $ git commit Uh-oh… We’ve found a conflict
17. Pull Requests • Navigate to your branch • Click Pull Request • Remember to include: ◦ The tracker ID in the title ◦ A short description of what's being changed.
18. PR 2 QA 4 QC • Hand off the Pull Request to QA for Testing: • Fill out QA Request ◦ Recommend: Include the Pull Request URL in the Testing Instructions field Inspector Casey
19. Acceptance Testing
20. So… how do we deploy to sandbox? • Head over to https://bamboo.impdir.com/ • Select correct sandbox • Configure
21. Deploying: Branch it
22. • From Sandbox Configuration • …or from the Dashboard Deploying: Run it
23. Deploying: Test it! http://ids-5555.branch.build.com/ Branch name from GitHub Store/Project Note: Branch names will always be lowercased in the URL
24. Congrats! We’re almost there…
25. QA Rejected my code… now what? FREAK OUT!!!!! (not really. please don’t… it’ll be okay)
26. Making additional changes $ #squishBugs ==============> $ git add FILES_CHANGED $ git commit -m "IDS-5555 more fu" $ git push • Open Pull Requests will automatically pick- up new changes to the source branch. • You will need to re-send the tracker to QA through JIRA
27. On to Code Review • Follows normal JIRA workflow
28. Success! Ready to Deploy
29. Closing out tracker • Merge Pull Request • Close Tracker in JIRA • Profit!
30. Questions?