Git

Git Definition

• [i] Git) - (definition:: A distributed version control system that is used to control source code and allow for collaboration) - (subject:: Computer Science

Git Example

Git allows developers to track changes made to the codebase over time, collaborate efficiently, and revert back to previous states if necessary. Here's a brief overview of how it works:

• Each file in a Git repository has a unique hash that identifies its specific state.
• When changes are made to a file, Git creates a new commit with the updated file and associated metadata like author, date, and commit message.
• Commits can be organized into branches, allowing developers to work on separate features or bug fixes without affecting the main codebase.
• Merge conflicts may occur when multiple developers make changes to the same lines of code. Git provides tools to resolve these conflicts and combine the changes appropriately.
• Branches can be merged back into the main branch (usually called master or main) once they are ready for production.

This allows different users of the same codebase to collaborate without causing issues. For example, let's take this situation.

In this case, two groups of users modified the same document at different times. Which one is pushed to the database? And how can you tell which file is the one that is pushed? Each file has a hash created by a Hash Function, and in this case, the earlier file hash will have a unique identifier that matches with its committed state in the Git repository. The later file, even though it may have changes that were made after the first commit, will still have a different hash because of these modifications.