Git and GitHub Masterclass - The Practical Bootcamp - Solving: Merge Conflict

The video tutorial covers practical steps in using Git for version control. It begins with setting up a project and making initial commits. The instructor demonstrates how to switch branches, make changes, and handle merge conflicts using VS Code. The tutorial also explains creating and managing branches, including commands to list merged and unmerged branches. The focus is on understanding Git operations and resolving conflicts effectively.

What command is used to check the current status of a Git repository?

• git commit

• git status

• git log

• git branch

When switching to a different branch in Git, which command is used?

• git move

• git change

• git switch

• git checkout

What is a common issue that arises when merging branches in Git?

• Commit loss

• Branch duplication

• Merge conflict

• File deletion

In VS Code, what can you do to resolve a merge conflict?

• Choose which changes to keep

• Restart the merge process

• Delete the conflicting file

• Ignore the conflict

Which command lists all branches that have been merged into the current branch?

• git branch --list

• git branch --all

• git branch --merged

• git branch --check

What command is used to create a new branch and switch to it immediately?

• git create new_branch

• git switch new_branch

• git checkout -b new_branch

• git branch new_branch

What does the command 'git branch --no-merged' display?

• Deleted branches

• Branches with conflicts

• All branches

• Branches not merged into the current branch