Mastering Git and GitHub

What is the primary purpose of Git?

• To compile and run software applications.

• To create and design user interfaces.

• To store and retrieve database records.

• To manage and track changes in source code during software development.

Explain the concept of branching in Git.

• Branching in Git is used to merge multiple repositories into one.

• Branching in Git is a feature that allows users to diverge from the main line of development and continue to work independently on different tasks.

• Branching in Git is a method to delete old versions of files.

• Branching in Git prevents any changes from being made to the main codebase.

What is the difference between 'git merge' and 'git rebase'?

• 'git merge' combines changes without altering history, while 'git rebase' creates a new branch.

• 'git merge' creates a merge commit, while 'git rebase' rewrites commit history.

• 'git merge' is used for pulling changes from a remote repository, while 'git rebase' is for local changes only.

• 'git merge' deletes the branch after merging, while 'git rebase' keeps it intact.

How do you create a new branch in Git?

• git branch or git checkout -b

• git switch

• git new branch

• git create

What is a pull request in GitHub?

• A pull request is a feature that automatically deploys code to production.

• A pull request is a request to delete a branch in a GitHub repository.

• A pull request is a request to merge code changes from one branch into another in a GitHub repository.

• A pull request is a tool for tracking issues in a GitHub repository.

Describe the process of reviewing a pull request.

• Only checking for syntax errors

• Ignoring code changes and merging immediately

• Reviewing only the comments without looking at the code

• The process of reviewing a pull request involves examining code changes, ensuring quality and functionality, providing feedback, and merging if approved.

What is a merge conflict and when does it occur?

• A merge conflict is a situation in version control where changes from different branches cannot be automatically merged due to conflicting modifications.

• A merge conflict is a type of error that happens during code compilation.

• A merge conflict occurs when two branches have identical changes.

• A merge conflict is resolved by deleting one of the branches involved.

How can you resolve a merge conflict in Git?

• Ignore the conflicts and push the changes anyway.

• Delete the repository and start over.

• Identify conflicted files, edit to resolve conflicts, add resolved files, and commit the merge.

• Automatically accept all incoming changes without review.

What are the best practices for writing commit messages?

• Make the subject lengthy

• Write in passive voice

• Use past tense for clarity

• Avoid referencing issues

• Use imperative mood, keep subject concise, provide detailed body, reference issues.

What is the purpose of a remote repository in Git?

• To limit access to the code for security reasons.

• The purpose of a remote repository in Git is to enable collaboration and version control for code across multiple users and locations.

• To store backups of local repositories only.

• To serve as a single source of truth for all project documentation.