• What is Git and why is it used?
  • Answer: Git is a distributed version control system used to track changes in source code during software development. It allows multiple developers to work on a project simultaneously without interfering with each other’s work. Git is used for source code management, collaboration, and version control, ensuring that the history of changes is preserved and accessible.
• What is a Git repository?
  • Answer: A Git repository is a storage space where your project files and their history are stored. It can be a local repository on your computer or a remote repository on a server. A repository tracks and saves the changes made to your files, allowing you to manage and collaborate on your project.
• What is the difference between git clone and git fork?
  • Answer: git clone is used to create a local copy of an existing remote repository. It downloads the repository and its entire history to your local machine. git fork is a feature provided by platforms like GitHub, which creates a personal copy of someone else's repository in your GitHub account. This forked repository can then be cloned to your local machine using git clone.
• Explain the concept of branches in Git.
  • Answer: Branches in Git are used to create isolated environments within a repository. A branch represents an independent line of development, allowing multiple features, bug fixes, or experiments to be worked on simultaneously without affecting the main codebase. The default branch in Git is usually called main or master. Developers can create new branches, switch between branches, and merge branches when changes are ready to be integrated.

1. What is the purpose of git merge and git rebase?
   • Answer: Both git merge and git rebase are used to integrate changes from one branch into another:
     • git merge combines the changes from one branch into another by creating a merge commit. It preserves the history of both branches.
     • git rebase moves or combines a sequence of commits to a new base commit. It rewrites the commit history to create a linear progression of commits, which can make the project history cleaner and easier to understand.

Intermediate Git Questions:

1. What is a Git commit and how do you create one?

   • Answer: A Git commit is a snapshot of the changes in the project files. It represents a point in the project’s history and includes a message describing the changes. To create a commit, you use the following commands:

     bashCopy code
     git add <file>       # Stage the changes
     git commit -m "Commit message"  # Create the commit with a message
     
     

2. How do you undo the last commit in Git?

   • Answer: To undo the last commit, you can use the git reset or git revert command:
     • git reset --soft HEAD~1: Moves the HEAD pointer to the previous commit, keeping the changes in the staging area.
     • git reset --hard HEAD~1: Moves the HEAD pointer to the previous commit and discards the changes.
     • git revert HEAD: Creates a new commit that undoes the changes made in the last commit, preserving the commit history.

3. What is the difference between git pull and git fetch?

   • Answer: Both commands are used to update your local repository with changes from a remote repository:
     • git fetch downloads the latest changes from the remote repository but does not merge them into your local branch. You need to merge the changes manually.
     • git pull is a combination of git fetch and git merge. It fetches the changes and automatically merges them into your current branch.

4. How do you resolve merge conflicts in Git?

   • Answer: Merge conflicts occur when changes from different branches conflict with each other. To resolve merge conflicts:
     • Identify the conflicting files using git status.
     • Open the conflicting files and manually resolve the conflicts by choosing the appropriate changes.
     • After resolving the conflicts, stage the resolved files using git add.
     • Complete the merge process by committing the changes with git commit.

5. What is a Git stash and how do you use it?

   • Answer: Git stash is used to temporarily save changes in your working directory without committing them. This allows you to switch branches or work on something else without losing your changes. To use Git stash:
     • Save changes: git stash
     • Apply stashed changes: git stash apply
     • List stashes: git stash list
     • Apply and remove the latest stash: git stash pop
     • Remove a specific stash: git stash drop stash@{n}