Java Brains

What does a version control system do?

Git and Github - high level workflows

Installing git

Initializing repository

Git two stage commit explained

The three state architecture

Selectively staging and committing

Think Changes Not Files!

Commit message editor

Seeing previous commits

Committing a file delete

Looking at code changes in commit history

Clearing local changes with git checkout

Unstaging files with git restore

Amending your last commit

Viewing diff of your changes

Using gitignore

Understanding a git commit

Branching concepts

Understanding branching with Git

Creating and switching between branches

Committing to a branch

Understanding branch pointers and commits

Fast forward merge

Merge with commit

Resolving merge conflicts

Git log with branches

Deleting branches

Switching to an older commit

Detached head - understanding and fixing

Rebasing explained - what and why

Doing a rebase

Cloning a remote repository

Committing to a cloned repo

Making changes to the remote repo

Understanding remote branches

Checking out remote branches and handling detached head

Examining and fetching from remote using git fetch

Syncing remote changes with local

Using git pull

Fetching, merging and pushing from other remote branches

Git fetch vs pull

Doing git pull with rebase

Forking a repository

Making a pull request

Conclusion

Before you go...