Merge (Fake)

6.1.3

Lookig for older versions of the documentation, pre FAKE v6? See

Merge Module

Namespace: Fake.Tools.Git
Assembly: Fake.Tools.Git.dll

Contains helper functions which allow to deal with git merge.

Types

Type	Description
MergeType	Git merge option.

Functions and values

Function or value	Description
`Merge.FastForwardFlag` Full Usage: `Merge.FastForwardFlag` Returns: `string`	Allows git to use fast-forward merges Returns: `string`
`Merge.NoFastForwardFlag` Full Usage: `Merge.NoFastForwardFlag` Returns: `string`	Forbids git to use fast-forward merges Returns: `string`
`Merge.compareBranches repositoryDir local remote` Full Usage: `Merge.compareBranches repositoryDir local remote` Parameters: repositoryDir : `string` - The git repository. local : `string` - The local branch name. remote : `string` - The remote branch name. Returns: `MergeType`	Tests whether branches and their "origin" counterparts have diverged and need merging first. repositoryDir : `string` The git repository. local : `string` The local branch name. remote : `string` The remote branch name. Returns: `MergeType`
`Merge.getMergeMessage repositoryDir` Full Usage: `Merge.getMergeMessage repositoryDir` Parameters: repositoryDir : `string` - The git repository. Returns: `string`	Gets the current merge message. repositoryDir : `string` The git repository. Returns: `string`
`Merge.merge repositoryDir flags branch` Full Usage: `Merge.merge repositoryDir flags branch` Parameters: repositoryDir : `string` - The git repository. flags : `string` - Additional flags. branch : `string` - The branch we want to merge in.	Performs a merge of the given branch with the current branch repositoryDir : `string` The git repository. flags : `string` Additional flags. branch : `string` The branch we want to merge in. Example `merge @"C:\code\Fake" NoFastForwardFlag "master"`