Complete Git Guide: Understand and Master Git and GitHub - Merging Versus Rebasing

What is a 3-way merge in Git?

• A merge that only happens in fast-forward scenarios

• A merge that creates a new commit with two parent commits

• A merge that involves three branches

• A merge that deletes the feature branch

When can a fast-forward merge occur?

• When there are conflicts between branches

• When merging multiple branches at once

• When no new commits have been made in the master branch after the feature branch was created

• When there are new commits in the master branch

Why are fast-forward merges rare in real-world projects?

• Because they are only used in emergency situations

• Because branches are often developed in parallel, leading to new commits in the master branch

• Because they require multiple branches to be merged simultaneously

• Because they do not preserve the history of commits

What is the main difference between merging and rebasing?

• Merging is faster than rebasing

• Merging preserves the entire history of commits, while rebasing creates a linear history

• Merging is used for conflict resolution, while rebasing is not

• Merging creates a linear history, while rebasing preserves all commit history

What happens to the history of commits when you rebase?

• The history becomes non-linear

• The history is preserved with all branches

• The history becomes linear and information about feature branches is lost

• The history is duplicated

In a merge commit, how many parents can it have?

• No parents

• Only one parent

• Two parents

• Multiple parents, depending on the number of branches merged

What tool is used in the demonstration to show the history of commits?

• GitLab

• Source 3

• Bitbucket

• GitHub