Learn about Git and version control setup, Git config, commits, branching, resolving merge conflicts, and key commands like Git pull, Git rebase, and Git stash for seamless workflows.

git_docker.tar.gz

email

name

This comprehensive course is your ultimate guide to learning Git and version control. You’ll start with the basics of Git version control, such as setting up your Git config and running basic terminal commands like the echo command. Then, you’ll explore GitHub as a development platform and understand Git snapshots.

You’ll advance your skills by creating and managing Git commits, undoing changes with Git undo commit, and reviewing your project’s history using Git logs. You’ll also tackle branching—learn how to rename or delete branches and confidently resolve Git merge conflicts. Additionally, you’ll master repository management with Git commands and organize changes using Git checkout, Git stash, and more.

After completing this course, you’ll be ready to use Git commands in your projects—a career-boosting skill for every software developer.

Learn Git

In the previous lesson, we looked at how merge conflicts can occur and worked with an example to create a merge conflict. We made changes to the same file, `file1.txt`, in two different branches and tried to merge them. Git can't decide on its own which change should remain so a developer would have to resolve the conflict themselves.

In the terminal below, we have a merge conflict that has taken place when we try to merge a branch called `feature_branch` with `master`.

# What to do when a merge conflict occurs
In the terminal provided above, our merge process was halted because of a conflict. We need to make sure that the conflict no longer exists so that the merge can be completed.
## Identify a merge conflict in the code
We made changes to `file1.txt` in both branches, so what does Git view as a conflict, and how does it depict it? Well, if you open up `file1.txt` in any text editor of your choice, you would see that Git has highlighted what it considers as a conflict in a syntax similar to this.

```
<<<<<<< HEAD
=======
>>>>>>> feature_branch
```

This lesson will teach you ways in which you can resolve merge conflicts.

Introduction to Git

Git Config

Git Branch

Git merge

GitHub

Git Rebase

Resolving Merge Conflicts

What to do when a merge conflict occurs