Parking Lot

[githubteacher]

Agenda

Day 1

Day 1 Meeting recording Access Passcode: hi6%=BJS

• [x] Intro
• [x] What is Git & GitHub?
• [x] Local operations
• [x] GitHub flow
• [x] Pull requests
• [x] Alias
• [x] Pruning
• [x] Merge conflicts

Day 2

Day 2 Meeting recording Access Password: ?h23MpF*

• [ ] Forking
• [ ] Bisect
• [x] Revert
• [ ] Staging hunks
• [x] Tags & Releases
• [x] Git Internals
• [ ] Dangerous commands
  • [x] Amend
  • [x] Reset
  • [x] Reflog
  • [x] Cherry pick
  • [ ] Merge strategies

Post any questions you may have here during the training.

[whatupfoo]

• delete local repo, what happens. deleting staged files? - Vijay

[whatupfoo]

Basic git commands

Additional commands:

• git branch -a
• git status
• git checkout <branch-name> or git switch <branch-name> to switch to a different (already-existing) branch
  • git checkout -b <branch-name> to create a new branch

[whatupfoo]

• Assume you have already cloned this repository on your local machine, you clone with git clone and you have a working feature branch on GitHub and on your local machine.

• If you need to create a new branch, you can do so with the "Branch: master" button in the Code tab OR create locally with git checkout -b BRANCHNAME

• Assuming you're also working in a team and not just by yourself in a repo

1. Update your local main branch because someone might have make updates while you're away/ sleeping: Make sure you're on the main branch, do git pull on master branch to get your local master branch updated
2. Do a reverse merge to your local feature branch so your feature branch is updated: we’re going to switch over to that branch first with git checkout FEATURE-BRANCH-NAME and then do a reverse merge git merge main
   • Make your commits: git add, git commit -m
3. Push it to Github: git push
4. Open a pull request, get your approvals and then merge it into master. Delete the branch you just merged.
5. Clean up your local machine, with

git checkout main
git pull --prune
git branch -d FEATURE-BRANCH-NAME