INTRODUCTION – Using Git Locally

PRACTICE QUIZ: ADVANCED GIT INTERACTION

1. Which of the following commands is NOT an example of a method for comparing or reviewing the changes made to a file?

2. What is the gitignore file?

3. What kind of file will the command git commit -a not commit?

4. What does HEAD represent in Git?

5. If we want to show some stats about the changes in a commit, like which files were changed and how many lines were added or removed, what flag should we add to git log?

6. If we’re making a small change and want to skip the staging step, which two flags do we need to add to the git commit command? Check all that apply.

7. If we want to see a specific commit, which command would we use along with the commit ID?

8. If we need to delete a file from our repository, we’ll need to run a command to delete the file and then stage and commit the change. Which command would we use to delete the file?

Practice Quiz: Undoing Things

1. Let’s say we’ve made a mistake in our latest commit to a public branch. Which of the following commands is the best option for fixing our mistake?

2. If we want to rollback a commit on a public branch that wasn’t the most recent one using the revert command, what must we do?

3. What does Git use cryptographic hash keys for?

4. What does the command git commit –amend do?

5. How can we easily view the log message and diff output the last commit if we don’t know the commit ID?

6. What is the purpose of the git checkout command?

7. What does the git commit –amend do?

8. Which of the following is true about the git revert command?

9. Which of the following is NOT true about the SHA1 hash numbers that Git uses to identify commits?

PRACTICE QUIZ: BRANCHING & MERGING

1. When we merge two branches, one of two algorithms is used. If the branches have diverged, which algorithm is used?

2. The following code snippet represents the result of a merge conflict. Edit the code to fix the conflict and keep the version represented by the current branch.

3. What command would we use to throw away a merge, and start over? 

4. How do we display a summarized view of the commit history for a repo, showing one line per commit? 

5. The following script contains the result of a merge conflict. Edit the code to fix the conflict, so that both versions are included.

def main():


    print("Start of program>>>>>>>")


    print("End of program!")


main()

6. What is the purpose of organizing repositories into branches?

7. What does the git checkout -b new branch command do?

8. How does git checkout switch branches?

9. What happens when we merge two branches?

10. What’s the advantage of Git throwing a merge conflict error in cases of overlap?

MERGING BRANCHES IN GIT

1. What is the purpose of the “git commit” command, and how does it contribute to the version control process?

2. In the Git repository “food-scripts,” what command can be used to check the current status of the working tree, including paths with differences between the index file and the current HEAD commit?

3. What Git command is used to revert a specific commit, effectively undoing the changes introduced by that commit, while still keeping a record of the undo operation in the Git history?

4. You and your colleagues are working on a software development project, and you’ve decided to use Git for version control and collaboration. What command do team members use to upload their local commits to the remote repository in the Git workflow described in the scenario?

5. In the lab, after merging the “improve-output” branch into the “master” branch, what type of merge is indicated by the message “Fast-forward”?

6. Which Git command is used to retrieve changes from a remote repository and merge them into your current branch?

7. In a Git repository, what is the purpose of creating and using branches?

8. What does it mean when Git says there is a ‘merge conflict’? 

9. When would you typically create a new branch in a Git repository?

10. In a Git repository, what is the purpose of the “git pull” command?

11. In the given Git repository named “food-scripts,” what command can be used to view the commit history, including the author’s name, email, date, and commit message?

12. In a Git repository, what command would you use to create a new branch based on the current branch, and what command would you use to switch to that newly created branch?

13. How are merge conflicts resolved?

14. What is the primary purpose of merging a branch back into the main branch in a Git repository?

15. What should you consider when deciding whether to create a new branch in Git? 

16. What is the purpose of a Git repository, and how does it facilitate version control?

17. What command would you use to create a patch file that represents the changes between the current working directory and the latest commit? 

18. In a scenario where you are collaborating with a team on a project using Git, what would be the role of a remote repository?

19. When working with Git, which commands are used to save changes to the repository and stage them for a commit? 

20. What is the purpose of branching in Git? 

21. What command is used to change a commit to a previous state in the Git repository?

22. In the lab’s Git fast-forward merge, what happened to the branch being merged into?

23. In a Git repository, what command is typically used to combine changes from a shared feature branch into another when you want to integrate new features or fixes?

24. When working with Git, which command is used to add changes to the staging area when preparing for a commit? 

25. In the lab’s Git operation, what does the “git merge improve-output” command achieve?

26. Which Git command is used to create a new branch in a Git repository?

CONCLUSION – Using Git Locally