This content is part of a third party extension that is not supported by the Cake project.
For more information about this extension see
Cake.Hg.
Summary
Perform merge of two branches
Syntax
public static MergeResult HgMerge(this ICakeContext context, DirectoryPath repositoryPath, string sourceBranch, string destinationBranch = null)
Examples
var diff = HgMerge("./", "rc", "dev");
Attributes
Type |
Description |
CakeMethodAliasAttribute |
|
CakeAliasCategoryAttribute |
|
Parameters
Name |
Type |
Description |
context |
ICakeContext |
Cake context |
repositoryPath |
DirectoryPath |
Path to repository |
sourceBranch |
string |
Name of source branch |
destinationBranch |
string |
Name of destination branch (Can be ommited to merge into current branch) |
Return Value
Type |
Description |
MergeResult |
MergeResult.Success if merge was successfull, MergeResult.UnresolvedFiles if merge conflict has occured |