Chapter 1. Git Basics in Practice

This book is intended for novice and advanced Git users to help them on their road to mastering Git. Therefore the following chapters will assume that the reader knows the basics of Git, and has 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 in the example of the development of a sample project, and collaboration between two developers.

In this chapter we will recall:

• Setting up a Git environment and Git repository (init, clone)
• Adding files, checking status, creating commits, and examining the history
• Interacting with other Git repositories (pull, push)
• How to resolve a merge conflict
• Creating and listing branches, switching to a branch, and merging
• How to create a tag