1 of 17

Version Control

Version Control

2 of 17

http://www.helpmykidlearn.ie/activities/3-4/detail/spot-the-difference

3 of 17

https://support.office.com/en-us/article/track-changes-in-word-197ba630-0f5f-4a8e-9a77-3712475e806a

4 of 17

5 of 17

6 of 17

https://insights.stackoverflow.com/survey/2017#work-version-control

7 of 17

https://github.com/

8 of 17

Freepik https://www.freepik.com

Repository, AKA Repo

9 of 17

Freepik https://www.freepik.com

Repository, AKA Repo

Commit

10 of 17

Freepik https://www.freepik.com

Repository, AKA Repo

Commit

Push

11 of 17

Freepik https://www.freepik.com

Repository, AKA Repo

Commit

Push

Pull

12 of 17

Files are hosted in a repository that is shared online with collaborators. You pull the repository’s contents so that you have a local copy of the files that you can edit. Once you are happy with your changes to a file, you stage the file and then commit it. You push this commit to the shared repository. This uploads your new file and all of the changes and is accompanied by a message explaining what changed, why and by whom.

13 of 17

Adapted from: https://www.atlassian.com/git/tutorials/using-branches/git-merge

Branch

Repository

Commits

14 of 17

Adapted from: https://www.atlassian.com/git/tutorials/using-branches/git-merge

Branch

Repository

Merge

Commits

15 of 17

Adapted from: https://www.atlassian.com/git/tutorials/using-branches/git-merge

Branch

Repository

Merge

Commits

Conflict

16 of 17

https://githubtraining.github.io/training-manual/GH4D/app_fork_workflow.html

17 of 17

Purposeful, single issue commits

Informative commit messages

Pull and push often