git_merge {git4r}

Merge Branch into Current Branch

Description

Merge a different branch into the current branch. The user is asked interactively to delete the merged (and now expendable) branch, and any conflicts arising are printed and the option given to open the files immediately for editing. Any files which resulted in conflicts will be flagged by git_add() to remind the user to manually confirm conflicts are resolved.

Usage

git_merge(branchname = NULL)

Arguments

branchname

Name of other branch to merge into the current one, will be asked interactively if left as NULL.

Details

A very helpful tool in RStudio is Edit -> ⁠Find in Files...⁠ which allows you to search your entire repository for where the conflicts are. These are identified by searching for the chevrons <<<

Conflicts are the usual format for git and may also happen after git_pull()

<<<<<<< HEAD
code-from-the-branch-you-have-stayed-on
=======
code-from-the-branch-you-have-just-merged-and-deleted
>>>>>>> merged-and-deleted-branch-name

Value

Invisible NULL