Going from freelance to working in an agency can be overwhelming, but don’t let the fear of a collaborative workflow scare you. What is Git?? Better question, what is version control? And what the heck is a local environment? We’ll cover the basics of – Local environments, multidevs, and branches – Version control – Overview of a git client

1. Moving from Freelance to
Collaborative Workflow
Git into the Groove
AmyJune Hineline
Community Manager of Opensource.com

2. Accessible Websites | 2
Colonialism is a
current ongoing
process, and we
need to build our
mindfulness of our
present
participation.

3. AmyJune Hineline (she/her)
Senior Community Manager at
Opensource.com
linkedin.com/volkswagenchick
twitter.com/volkswagenchick

4. Spot (he/him/they)
Spotty McSpots A lot
Neighborhood love bug
● Chasing his own tail
● Getting pets
● Drools

5. What we’ll
discuss today
▸ Freelance versus Agency life
▸ Version control
･ Git
･ Git branches
･ Git commands
▸ Git clients
▸ Local environments
▸ Demos if time permits
Git into the Groove | 5

6. Moving from Freelance
to Agency

7. Freedom!
Do you own thing!
Git into the Groove | 7

8. Wild, wild, west
You’ve been on your own awhile….
Git into the Groove | 8

9. Juggling all the
roles
You’ve been on your own awhile….
Git into the Groove | 9

10. Agency Workflow
Working with others

11. You’re on a
team!
Teamwork offers a diversity of
thought and creativity.
Git into the Groove | 11

12. Learning
opportunities
Exposure to structured learning,
and mentoring.
Git into the Groove | 12

13. Workflow Management
Submit a
Ticket
Backup code,
database and files
Feature branches
Set up local environment
Push up to
Development
Approval &
push to
production
QA &
Testing
Sync code and
clone
Staging
Git into the Groove | 13

14. Version Control
Managing code over time

15. According to Atlassian
Version control software keeps track of
every modification to the code in a special
kind of database.
Git into the Groove | 15

16. 16
Prerequisites

17. Install git locally.
A computer equipped for the task.
Git into the Groove | 17

18. Basic knowledge of the command line
More than cute ascii art...
Git into the Groove | 18

19. 19
Git Clients

21. Git Clients
Git into the Groove | 21

22. IDEs
Git into the Groove | 22

23. 23
Basics of git

24. 24
Never Gonna Git you down...
Never Gonna Git
You Up
Git into the Groove | 24

25. The basics
● git init
● git status
● git branch
● git diff
● git log
● git push
● git pull
● git add
● git commit
● git merge
The basics of git

26. 26
Working locally
Git into the Groove
Git into the Groove | 26

27. If you haven't connected your local
repository to a remote server, add
the server to be able to push to it.
git pull
git remote
Fetch and merge changes on the
remote server to your working
directory.
git clone
Create a working copy of a local
repository.
Working Locally
Git into the Groove | 27

28. Cloning
Git into the Groove | 28

29. 29
Take my Branch Away
Git into the Groove | 29

30. Branches
List all the branches in
your repo.
git branch
Delete the feature branch.
git checkout -d
Create a new branch and
switch to it.
git checkout -b
Switch from one branch to
another.
git checkout
Git into the Groove | 30

31. Branches
Git into the Groove | 31

32. 32
Push It…
Push it real good
Git into the Groove | 32

33. Pushing
Add one or more files to
staging.
git add *
git add <file name>
git add
Send changes to the main
branch of your remote
repository.
git push
Fetch and merge changes
on the remote server to
your working directory.
git pull
Commit changes to
current branch.
git commit -m “message
here”
git commit -a
git commit
Git into the Groove | 33

34. Pushing
Git into the Groove | 34

35. Pausing for a moment to
hold space for
#BlackTransLivesMatter

36. Requesting for the very first
time….
Like a Merge-In
Git into the Groove | 36

37. Fetch and merge changes on the
remote server to your working
directory.
git merge
git pull
To merge a different branch into
your active branch
git remote
This command is used to connect
your local repository to the remote
server.
Bringing it all Together
Git into the Groove | 37

38. Merging
Git into the Groove | 38

39. Merging
Git into the Groove | 39

40. 40
If you’ve got the notion…
Conflicts N
Commotion
Git into the Groove | 40

42. Merge Conflicts
List the files you've
changed and those you
still need to add or
commit.
git status
Send changes to the main
branch of your remote
repository.
git push
View all the m.erge
conflicts
git log - -merge
Show changes between
commits, commit and
working tree, etc
git diff
Git into the Groove | 42

43. Conflicts
Git into the Groove | 43

44. This command undoes all the
commits after the specific commit
and preserves the changes.
git reset - -hard <commit>
git reset <commit>
This command discards all history
and goes back to the specific
commit.
git fetch origin
Fetches the latest history from the
server.
Really mess up?
Git into the Groove | 44

45. Reset of all the
things!
Git into the Groove | 45

46. 46
Web Based
Version Control
GitLab, BitBucket, GitHub…

47. The Workflow
▸ Create a branch
･ Work in a space away from production
▸ Work locally
･ Work from anywhere
▸ Add commits
･ Modify the code and add the changes
▸ Create a pull request
･ This starts the process of review
▸ Code review
･ Discuss and collaborate
▸ Merge
･ Move your code into the main branch
Git into the Groove | 47

48. GitHub repo
Git into the Groove | 48

49. GitHub pull
request
Git into the Groove | 49

50. Local Environments

51. 51
Prerequisites

52. At a minimum
Web server, a database server, and
PHP for WordPress
Git into the Groove | 52

53. A computer
equipped for
task
Processor, memory, disk space…
Git into the Groove | 53

54. Local Server
Setups
▸ Linux development environments
▸ Mac OS development environment
▸ Windows development environment
▸ Virtual Machine development
environments
▸ Docker development environments
Git into the Groove | 54

55. 55
Making the
case
Why have a local server?

56. Limited Access
to Client Server
If you’re building a website and you
don’t have access to the web
server.
Git into the Groove | 56

57. Experimentation
You don’t want to mess with the
production code while experimenting
with new code.
Git into the Groove | 57

58. Test your development before
going live.
Makes the development less
stressful.
More control!
Customize your
setup
Debugging complex errors requires
more control over your
environment.
No internet
connection required!
No longer bound to the internet.
Work from anywhere!
Local Environments
Git into the Groove | 58

59. Local web
development
environment
Usually come equipped with:
▸ A web server
▸ A database management system
▸ A server-side programming language
▸ An interface for controlling the web server
▸ An interface for accessing the database
Git into the Groove | 59

60. 60
New Browser
Based
Environment
https://github.com/drud/ddev
-gitpod-launcher

61. Thanks!!
linkedin.com/volkswagenchick
twitter.com/volkswagenchick

62. ▸ Bitbucket Support
▸ Top 20 Git Commands With Examples
▸ Oh Shit, Git!?!
▸ Git Documentation
Resources - Git
Git into the Groove | 62

63. PANTHEON.IO
I’m a Pantheon Hero
I advocate for the growth, education,
and advancement of the Open Web
and Pantheon
Learn more about what it takes to be a
Hero below:
https://community.pantheon.io

64. DEMO!!
Because live demos always work!
64