96 members
Description
Hello Juggies!
The time has come for someone else to take the reins with this group. It’s been incredibly rewarding for over 20 years and I thank all of you for your contributions. Hopefully I will see many of you at the next meet up.
Best regards,
Mike
by Michael Levin
Aug 7, 2019
Join us for a Git presentation featuring RustyRusty Phillips has been a polyglot developer for over 20 years (and Java to some degree during all of that time), and has spent that time specializingin not specializing - learning as much as possible in almost everyarea of computer science and computer engineering. One of the fewareas that he has specialized in is configuring his environment tosuit the work that he's doing.THE GIT STUFF:1. Overview of version control features- Locking checkout vs non-locking checkout- distributed vs server-client- Merge advantages of distributed- Large binary disadvantage of distributed version control.2. Git setup:- ssh public/private keys; using ~/.ssh/config- github, gitlab, bitbucket. (gitlab for demo)- .gitconfig setup.3. branches4. commit vs push5. fetch vs pull6. The dangerous, common commands:rebase, cherry-pick7. Other important commands:rm, reset, stash8. merge vs mergetool, diff vs difftoolDEMO - commits with conflicts.Other important areas:1. Stealing dotfiles from the internet(mine: tmux + nvim + oh-my-zsh + powerline).2. CI/CD for gitlab via yaml file.Stay tuned for details. Let me know if you’ll help out by sponsoring pizza. Thanks, Mike Levin@mikelevin
Cancel
OrlandoJUG Town
96 members
Description
Hello Juggies!
The time has come for someone else to take the reins with this group. It’s been incredibly rewarding for over 20 years and I thank all of you for your contributions. Hopefully I will see many of you at the next meet up.
Best regards,
Mike
OJUG ::: Git with Rusty 8/22
by Michael Levin
Aug 7, 2019
Rusty Phillips has been a polyglot developer for over 20 years (and Java to some degree during all of that time), and has spent that time specializing
in not specializing - learning as much as possible in almost every
area of computer science and computer engineering. One of the few
areas that he has specialized in is configuring his environment to
suit the work that he's doing.
THE GIT STUFF:
1. Overview of version control features
- Locking checkout vs non-locking checkout
- distributed vs server-client
- Merge advantages of distributed
- Large binary disadvantage of distributed version control.
2. Git setup:
- ssh public/private keys; using ~/.ssh/config
- github, gitlab, bitbucket. (gitlab for demo)
- .gitconfig setup.
3. branches
4. commit vs push
5. fetch vs pull
6. The dangerous, common commands:
rebase, cherry-pick
7. Other important commands:
rm, reset, stash
8. merge vs mergetool, diff vs difftool
DEMO - commits with conflicts.
Other important areas:
1. Stealing dotfiles from the internet
(mine: tmux + nvim + oh-my-zsh + powerline).
2. CI/CD for gitlab via yaml file.
Stay tuned for details. Let me know if you’ll help out by sponsoring pizza. Thanks, Mike Levin
@mikelevin