Find Interview Questions for Surya Software

To resolve merge conflicts in Git, follow these steps:

1. Identify the files with conflicts by running `git status`.
2. Open the conflicted files in a text editor. Look for conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`).
3. Manually edit the file to resolve the conflicts by choosing which changes to keep or combining them.
4. After resolving, save the file.
5. Stage the resolved files using `git add <filename>`.
6. Complete the merge by committing the changes with `git commit`.

Tags in Git are used to mark specific points in the repository's history, often to denote release versions. To create a tag, use the command `git tag <tag-name>`. To push tags to the remote repository, use `git push origin <tag-name>` or `git push –tags` to push all tags at once.

You can view the history of commits by using the command `git log`.

Merge combines two branches by creating a new commit that includes changes from both, preserving the history of both branches. Rebase, on the other hand, moves or combines a sequence of commits to a new base commit, creating a linear history without a merge commit.

Git internals consist of four main components:

1. **Objects**: Git stores data as objects, which include blobs, trees, commits, and tags. Each object is identified by a SHA-1 hash.

2. **Blobs**: These are binary large objects that store the content of files. Each file's content is stored as a blob.

3. **Trees**: Trees represent directories and contain references to blobs (files) and other trees (subdirectories). They maintain the structure of the repository.

4. **Refs**: Refs are pointers to commits. They include branches and tags, allowing Git to track different versions of the project.

Together, these components enable Git to efficiently manage version control and track changes in a repository.