Rerere for repeated conflict resolution in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to enable Git's rerere feature globally.

Git

git config --global rerere.[1] true

Drag options to blanks, or click blank then click option'

Aenabled

Bauto

Cuse

Denable

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'rerere.enable' instead of 'rerere.enabled'.

Forgetting to set the value to 'true'.

The correct setting to enable rerere is rerere.enabled set to true.

2fill in blank

medium

Complete the command to manually record a conflict resolution using rerere.

Git

git rerere [1]

Drag options to blanks, or click blank then click option'

Aforget

Bstatus

Cclear

Drecord

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git rerere clear' which deletes recorded resolutions.

Using 'git rerere status' which only shows rerere status.

The git rerere record command records the current conflict resolution for reuse.

3fill in blank

hard

Fix the error in this command to show the current rerere status.

Git

git rerere [1]

Drag options to blanks, or click blank then click option'

Alist

Bshow

Cstatus

Dcheck

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git rerere show' which is not a valid command.

Using 'git rerere list' which does not exist.

The correct command to display rerere status is git rerere status.

4fill in blank

hard

Fill both blanks to create a rerere cache directory and configure Git to use it.

Git

mkdir -p [1] && git config rerere.[2] [1]

Drag options to blanks, or click blank then click option'

A~/.git_rerere_cache

Bdir

Ccache

D~/.cache/git_rerere

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'rerere.cache' instead of 'rerere.dir'.

Using a directory path without creating it first.

The rerere cache directory can be set with rerere.dir. Creating ~/.git_rerere_cache and configuring rerere.dir to it sets the cache location.

5fill in blank

hard

Fill all three blanks to create a dictionary comprehension that maps conflicted files to their resolution status using rerere.

Git

conflicts = {file: git rerere [1] for file in [2] if git rerere [3] file}

Drag options to blanks, or click blank then click option'

Astatus

Bconflicted_files

Cresolved

Dlist

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'list' instead of 'conflicted_files' for iteration.

Using 'git rerere list' which is not a valid command.

This comprehension maps each conflicted file to its rerere status. Use git rerere status to get status, iterate over conflicted_files, and check with git rerere status file.