Git Basics in Practice

This book is intended for intermediate and advanced Git users to help them on their road to mastering Git. Therefore, the chapters following this one will assume you know the basics of Git, and have advanced past the beginner stage.

This chapter will serve as a reminder of version control basics with Git. The focus will be on providing practical aspects of the technology, showing and explaining basic version control operations on the example of the development of an example project, and the collaboration between two developers.

In this chapter, we will cover the following:

• A brief introduction to version control and Git
• Setting up a Git environment and Git repository (init and clone)
• Adding files, checking status, creating commits, and examining the history
• Interacting with other Git repositories (pull and push)
• Creating and listing branches, switching to a branch, and merging changes
• Resolving a simple merge conflict
• Creating...