Gain insights into Git version control, delving into commits, branches, and remote collaboration. Learn about resolving conflicts and handling erroneous changes to manage software projects efficiently.

MBE-  Beginning Git Version Control by Thomas Makzan.png

DockerGit.tar.gz

email

name

Grouping 

Git is one of the most widely used version control tools in the software industry. Whether working on frontend or backend, native or server-side applications, every software developer should be comfortable with Git version control.

In this course, you’ll learn how Git is used in software projects and the basics of version control. Moreover, you’ll learn commits, pushing code, branches, and Git Stash. Finally, you’ll learn to use Git for remote collaboration, including reconciling conflicts and correcting erroneous changes with fetch, pull, reversion, and cherry-picking. At each step, you’ll solve quizzes to test your knowledge.

By the end of this course, you’ll have a working knowledge of Git and its use in version control. You’ll be able to proficiently and efficiently manage your future software projects.

Getting Started with Git Version Control

# The `git reset` command
The `git reset` command removes the commits and puts the changes in either the staged area (with the `--soft` flag) or in the unstaged area (without the `--soft` flag).
# Group multiple commits 
If we reset multiple commits, the changes in these commits are grouped. We can then commit again including all these changes in one commit. In this way, we can group multiple commits into one commit.
# Usefulness of grouping commits 
This technique is useful when we have multiple commits that serve a single purpose. This may happen when we create a commit and then find minor issues to fix until we deliver the implementation. We may need additional commits to fix tiny mistakes.

Before we deliver and push those commits, it makes sense to group them into one commit.

For example, we’ve run the following commands in the terminal below:
 

``` Shell
$ mkdir SampleProject
$ cd SampleProject
$ git init
$ touch file1.txt
$ git add file1.txt
$ git commit -m "creation of file1"
$ touch file2.txt
$ git add file2.txt
$ git commit -m "creation of file2"
$ echo "line 1" >>  file2.txt
$ git add file2.txt
$ git commit -m "line 1 file 2"
$ git commit -m "creation of file2"
$ echo "line 2" >>  file2.txt
$ git add file2.txt
$ git commit -m "line 2 file 2"
$ git commit -m "creation of file2"
$ echo "line 3" >>  file2.txt
$ git add file2.txt
$ git commit -m "line 3 file 2"
$ git commit -m "creation of file2"
$ echo "line 4" >>  file2.txt
$ git add file2.txt
$ git commit -m "line 4 file 2"
```
We create a directory named `SampleProject`. Inside this directory, we initialize Git, create two files (`file1.txt` and `file2.txt`), and commit them. After initial commits, we make changes to the file `file2.txt` and then commit it again.

Now, run the following commands:
``` shell
$ git status
$ git log --oneline --graph --decorate --all
```
We get the following output (the commit IDs can be different):
``` Shell
* 881ea82 (HEAD -> master) line 4 file 2
* fed32df line 3 file 2
* 9956807 line 2 file 2
* 617ecf3 line 1 file 2
* 2626bb9 creation of file2
* 2c02725 creation of file1
```

Learn to group multiple commits into one commit by using git reset.

Getting Started

Basic Command

Behind the Scenes

Essential Techniques

Flow Control

Remote and Collaboration

Handle Conflicts

Undo Changes

Rebase and Cherry Pick

Conclusion

Group Commits With the git reset Command

The `git reset` command

Group multiple commits

Group Commits With the git reset Command

The git reset command

Group multiple commits

The `git reset` command