merge
Description
merge(
merges the branch, commit, or tag specified by repo
,commitIdentifier
)commitIdentifier
into
the current branch of the Git™ repository repo
.
When you attempt to merge a branch that results in file conflicts, the
merge
function reports that the merge is incomplete and lists the
conflicted files. To complete the merge, resolve and commit the conflicted files.
Examples
Input Arguments
Tips
When you perform a merge, you can use the add
or rm
functions to
mark the conflict on a file as resolved.
Version History
Introduced in R2023b
See Also
gitclone
| gitrepo
| commit
| createBranch
| switchBranch
| fetch
| push