Practice - 5 Tasks
Answer the questions below
1fill in blank
easyComplete the command to start a merge in Git.
Git
git merge [1] Drag options to blanks, or click blank then click option'
Attempts:
3 left
💡 Hint
Common Mistakes
Using 'commit' instead of 'branch' causes errors.
Trying to merge 'clone' is invalid.
✗ Incorrect
The git merge command is used to merge a branch into the current branch.
2fill in blank
mediumComplete the sentence: Merge conflicts happen when two branches change the same {{BLANK_1}}.
Git
Merge conflicts happen when two branches change the same [1]. Drag options to blanks, or click blank then click option'
Attempts:
3 left
💡 Hint
Common Mistakes
Confusing 'commit' with the changed item.
Thinking branches themselves conflict.
✗ Incorrect
Conflicts occur when two branches change the same file in different ways.
3fill in blank
hardFix the error in the command to abort a merge conflict resolution.
Git
git [1] merge --abort Drag options to blanks, or click blank then click option'
Attempts:
3 left
💡 Hint
Common Mistakes
Using 'git reset merge' is invalid.
Using 'git revert merge' does not abort merge.
✗ Incorrect
The correct command to abort a merge is git merge --abort.
4fill in blank
hardFill both blanks to create a command that shows files with conflicts.
Git
git [1] --name-only --diff-filter=[2]
Drag options to blanks, or click blank then click option'
Attempts:
3 left
💡 Hint
Common Mistakes
Using 'merge' instead of 'diff' shows merge commands, not file list.
Wrong diff filter shows wrong files.
✗ Incorrect
git diff --name-only --diff-filter=U lists files with unresolved conflicts.
5fill in blank
hardFill all three blanks to create a command that marks a conflict as resolved.
Git
git [1] [2] [3]
Drag options to blanks, or click blank then click option'
Attempts:
3 left
💡 Hint
Common Mistakes
Forgetting '--' causes errors if file name looks like option.
Using 'commit' instead of 'add' does not mark resolution.
✗ Incorrect
git add -- file.txt marks the conflict in file.txt as resolved.