Book Image

Git and GitHub: The Complete Git and GitHub Course [Video]

By : George Lomidze
4 (1)
Book Image

Git and GitHub: The Complete Git and GitHub Course [Video]

4 (1)
By: George Lomidze

Overview of this book

If you create websites, web applications, or mobile apps, or write any code, using a version control system is essential. This course will help you get to grips with one of the most widely used version control systems popular among professional developers and designers. Git allows you to record and recall different versions of your project, and GitHub enables you to share your code with the world, allowing you to collaborate with other developers. Starting with Git installation, you’ll learn the fundamentals of Git. You’ll then grasp the basics of the terminal, create your first local repository, and save different versions of the project as snapshots using commits. You’ll discover how to check the previous versions of your project, update them, or even delete them with git checkout, git revert, and git reset. Once you’ve covered the basics of GitHub, you’ll get to grips with creating a repository on GitHub, connecting the local repository to a remote one, making commits, and much more. You’ll work with branching, and learn how to deal with branches locally as well as remotely. The course covers different methods to merge branches and deal with merge conflicts, and delves into forking and contributing. You’ll see how you can copy someone else's remote repository on your GitHub account, clone it to your local computer, and contribute to the original project. Finally, you’ll explore how to collaborate on GitHub by setting up a collaboration team and defining rules for collaborators. All the code and supporting files for this course are available here: https://github.com/PacktPublishing/Git-and-GitHub-The-Complete-Git-and-GitHub-Course
Table of Contents (9 chapters)
Chapter 7
Merging on GitHub
Content Locked
Section 2
Merge Conflicts on GitHub
Merging on GitHub: Merge Conflicts on GitHub