Skip to content

Halil Umut Özdemir Git Research

Jump to bottom
Halil Umut Özdemir edited this page Feb 16, 2020 · 1 revision

What is version management(control) and its benefits?

Version control software keeps track of every modification to the code in a special kind of database. If a mistake is made, code can be turned back to the earlier versions.

Version control software helps prevent concurrent work from conflicting. So, 2 different developers can make changes to different parts of the same code.

Branching and merging is also a benefit of Git. With branches, Git can keep multiple streams of work independent from each other while also providing the feature to merge them. So, for any software different branches can be created for the development part and in the end, all branches can be merged.

What is Git and How it works?

Distributed version control systems are one of the categories of the version control systems. In distributed models, there is no central computer and every developer has a complete copy of the project.

Git is a free and open-source Distributed Version Control System.

Some Terms

  • Commit: For the perspective of Git, data is a set of snapshots. For every commit or save, Git takes a snapshot of the project to keep track of every modification.

  • Repository: A directory that contains the project and some files to communicate with Git.

  • Staging Area: A file that stores the information about the changes of your directory. These changes will be the information needed in the next commit.

A Git repository can be viewed as 3 main areas: the working directory, the staging area, and the repository that the commits will be saved.

To make any change in the repository, the first files that have modification must be added to the Staging Area. For each commit, Git stores a snapshot of files with modifications and gives each commit a 7 digit id. Also, each commit has a commit message, it is important to create meaningful messages for each commit.

Tagging

We can add some tags to our commits. With using these tags the important commits can be remembered. For example, at the end of the development of each version of the software, a tag can be added to remember to the last commit.

Branching

Branches can be thought of as a series of commits and some pointers that point the latest commit in that series. When a new branch is created, a new pointer is initialized at your current branch. If you make any commit to the new branch the old branch is not affected by this commit.

Merging

Merging is combining two branches. To merge 2 branches Git creates a new commit and combines 2 branches on that new commit. While merge operation there can be some conflicts. To merge 2 branches all conflicts must be solved. There are some merge conflict indicators that is explained in the link

Working on a Remote Repository(GitHub)

When we want to take the commits in the remote repository to our local repository, we make a pull. When we send the commits made in our local repository to the remote repository, we make a push.

Basic Git Commands

References

Clone this wiki locally