- What is Git rebase and when would you use it instead of Git merge?
- Answer: Git rebase is used to reapply commits from one branch onto another branch, creating a linear commit history.
It’s often used instead of Git Merge when you want to maintain a clean and linear history, especially for feature branches or when integrating changes from one branch onto another.
- Answer: Git rebase is used to reapply commits from one branch onto another branch, creating a linear commit history.
- Explain the difference between soft reset, mixed reset, and hard reset in Git.
- Answer: Soft reset moves the HEAD pointer to a specified commit without changing the index or working directory, leaving changes staged.
- Mixed reset moves the HEAD pointer and resets the index to match the specified commit, leaving changes unstaged.
- Hard reset moves the HEAD pointer and resets both the index and the working directory to match the specified commit, discarding all changes.
- How do you undo the last commit in Git?
- Answer: You can undo the last commit in Git using the command,
git reset HEAD^
which moves the HEAD pointer to the previous commit while keeping the changes in the working directory.
- Answer: You can undo the last commit in Git using the command,
- What is Git stash and how do you apply stashed changes?
- Answer: Git stash is used to temporarily store changes that are not ready to be committed.
You can apply stashed changes using the commandgit stash apply
which applies the most recently stashed changes, orgit stash apply <stash_id>
to apply a specific stash.
- Answer: Git stash is used to temporarily store changes that are not ready to be committed.
- How do you amend the last commit message in Git?
- Answer: You can amend the last commit message in Git using the command
git commit --amend -m "New commit message"
which opens the default text editor to modify the commit message or allows you to specify a new commit message with-m.
- Answer: You can amend the last commit message in Git using the command
- What is Git cherry-pick and when would you use it?
- Answer: Git cherry-pick is used to apply a specific commit from one branch onto another branch.
It’s often used to apply a bug fix or feature from one branch to another without merging the entire branch.
- Answer: Git cherry-pick is used to apply a specific commit from one branch onto another branch.
- How do you list all the branches merged into the current branch in Git?
- Answer: You can list all the branches merged into the current branch in Git using the command
git branch --merged.
- Answer: You can list all the branches merged into the current branch in Git using the command
- How do you create a new branch and push it to a remote repository in Git?
- Answer:
- To create a new branch:
git checkout -b <branch_name> - To push it to a remote repository:
git push -u origin <branch_name>
- To create a new branch:
- Answer:
- What is the purpose of forking a repository in Git?
- Answer: Forking a repository creates a copy of the original repository under your account.
It allows you to make changes to the codebase without affecting the original repository and enables contributions through pull requests.
- Answer: Forking a repository creates a copy of the original repository under your account.
- How do you sync a forked repository with the original repository’s changes?
- Answer:
- Add the original repository as an upstream remote:
git remote add upstream <original_repo_url> - Fetch the changes from the upstream repository:
git fetch upstream - Merge the changes into your local forked branch:
git merge upstream/mainorgit rebase upstream/main - Push the updated changes to your forked repository:
git push origin main
- Add the original repository as an upstream remote:
- Answer:
- Explain the concept of Git branches in collaborative projects.
- Answer: Git branches allow collaborators to work on different features or fixes simultaneously without interfering with each other’s work.
Each branch represents an independent line of development, and changes can be merged back into the main branch once they are complete.
- Answer: Git branches allow collaborators to work on different features or fixes simultaneously without interfering with each other’s work.
- How do you resolve a merge conflict in a pull request?
- Answer:
- Pull the latest changes from the target branch:
git pull origin main - Resolve the conflicts in your local repository by editing the conflicting files.
- Add the resolved files to the staging area:
git add <conflicting_file> - Commit the changes:
git commit -m "Resolved merge conflict" - Push the changes to the remote repository:
git push origin <branch_name>
- Pull the latest changes from the target branch:
- Answer:
- What is Git rebase and when is it used in collaborative projects?
- Answer: Git rebase is used to reapply a series of commits onto a new base commit. It’s often used in collaborative projects to maintain a clean and linear history by incorporating changes from one branch onto another without creating merge commits.
- Answer: Git rebase is used to reapply a series of commits onto a new base commit. It’s often used in collaborative projects to maintain a clean and linear history by incorporating changes from one branch onto another without creating merge commits.
- How do you review someone else’s pull request in Git?
- Answer:
- Review the changes in the pull request on the Git hosting platform.
- Check out the pull request branch locally:
git fetch origin pull/<pull_request_number>/head:<local_branch_name> - Test the changes and review the code.
- Provide feedback and comments on the pull request.
- Approve or request changes to the pull request.
- Answer:
- How do you delete a remote branch in Git?
- Answer: To delete a remote branch in Git, you can use the command:
git push origin --delete <branch_name>
- Answer: To delete a remote branch in Git, you can use the command:
- What are Git best practices?
- Answer: Git best practices are guidelines and recommendations for using Git effectively in software development projects.
These practices help ensure collaboration, code quality, and maintainability while leveraging the full potential of Git version control.
- Answer: Git best practices are guidelines and recommendations for using Git effectively in software development projects.
- Name some common Git best practices.
- Answer: Some common Git best practices include:
- Using meaningful commit messages.
- Keeping commits small, focused, and atomic.
- Regularly pulling changes from remote repositories to stay up-to-date.
- Using branching strategies like Gitflow or GitHub flow.
- Performing code reviews before merging changes.
- Using Gitignore files to exclude unnecessary files from version control.
- Keeping the repository history clean by avoiding unnecessary commits or rebase operations.
- Answer: Some common Git best practices include:
- Why is it important to use meaningful commit messages?
- Answer: Meaningful commit messages provide context and clarity about the changes introduced in a commit. They help team members understand the purpose and impact of each commit, making it easier to track changes, review code, and troubleshoot issues.
- Answer: Meaningful commit messages provide context and clarity about the changes introduced in a commit. They help team members understand the purpose and impact of each commit, making it easier to track changes, review code, and troubleshoot issues.
- What is the significance of keeping commits small and focused?
- Answer: Keeping commits small and focused improves code readability, reviewability, and maintainability. It allows changes to be easily understood and reverted if necessary, reduces the risk of merge conflicts, and facilitates collaboration among team members.
- Answer: Keeping commits small and focused improves code readability, reviewability, and maintainability. It allows changes to be easily understood and reverted if necessary, reduces the risk of merge conflicts, and facilitates collaboration among team members.
- How does using a branching strategy like Gitflow or GitHub flow benefit a project?
- Answer: Using a branching strategy like Gitflow or GitHub Flow provides a structured workflow for managing feature development, releases, and hotfixes. It promotes parallel development, code isolation, and stability in production code. Additionally, it helps streamline the release process and facilitates collaboration among team members.
