Skip to contents

"Hey I'd like to see what merge conflicts look like!"

Source: R/exo-conflict.R
exo_conflict.Rd

I made some work in a feature branch and want to merge it. Meanwhile, the main branch advanced. Unfortunately someone touched the same file as I did. Now I need to fix a merge conflict!

See also https://happygitwithr.com/git-branches.html#dealing-with-conflicts.

Usage

exo_conflict(parent_path)

Arguments

parent_path

Path where to create the exercise repo

Value

The path to the new project

Workflow

Running the function will create the exercise as a new folder in parent_path. If called from RStudio or Positron, the function will open a new R session in that IDE. If not, the user will need to navigate to the path returned by the function, and launch an R session from there. The new R session will display messages about what challenge to solve, and running the tip() function from that new R session will display additional guiance.

git merge.

Examples

if (FALSE) { # interactive()
parent_path <- withr::local_tempdir()
path <- exo_conflict(parent_path = parent_path)
}