git merge command - Cheat Sheet & Quick Revision

Recall & Review

beginner

What does the git merge command do?

It combines changes from one branch into another branch, integrating the histories.

beginner

What is a 'merge conflict' in Git?

A situation where Git cannot automatically combine changes because the same part of a file was changed differently in the branches being merged.

intermediate

How do you resolve a merge conflict?

You manually edit the conflicting files to choose or combine changes, then mark the conflict as resolved by adding the files and committing.

intermediate

What does the command git merge --no-ff do?

It forces Git to create a merge commit even if the merge could be done with a fast-forward, preserving the branch history.

beginner

What is a 'fast-forward' merge?

A merge where the current branch pointer is simply moved forward to the target branch because there are no divergent changes.

What happens when you run git merge feature while on the main branch?

A The <code>feature</code> branch is deleted.

B Changes from the <code>feature</code> branch are combined into <code>main</code>.

C The <code>main</code> branch is renamed to <code>feature</code>.

D A new branch called <code>feature</code> is created.

The git merge command integrates changes from the specified branch into the current branch.

Which command helps you see which files have conflicts after a merge?

A <code>git status</code>

B <code>git log</code>

C <code>git branch</code>

D <code>git checkout</code>

git status shows files with conflicts needing resolution.

What does a 'fast-forward' merge mean?

A Git resets the repository to an earlier commit.

B Git creates a new merge commit.

C Git deletes the source branch.

D Git moves the branch pointer forward without creating a new commit.

Fast-forward means no new commit is created; the branch pointer just moves forward.

How do you force Git to create a merge commit even if fast-forward is possible?

A <code>git merge --squash</code>

B <code>git merge --force</code>

C <code>git merge --no-ff</code>

D <code>git merge --abort</code>

The --no-ff option forces a merge commit.

What should you do after fixing merge conflicts manually?

A Add the resolved files and commit the merge.

B Delete the branch.

C Run <code>git reset</code>.

D Create a new branch.

After resolving conflicts, you stage the files and commit to complete the merge.

Explain the process and purpose of the git merge command.

Think about how two different versions of a project come together.

Describe what a merge conflict is and how you would resolve it in Git.

Imagine two friends editing the same sentence differently.