No Conflicts Merge Class Documentation
This document was created by the PetranWay Autodocumentation Utility.
This merge operation only succeeds when a merge is possible without conflicts. In other cases, an error is returned. Optionally, a merge commit can be created (this uses the "--no-ff" option), but this will still fail with this operation if there are conflicts.
C:\PetranWay\Reuse Development\LabVIEW_Git\Merge Operations\No-Conflicts Merge\No-Conflicts Merge.lvclass
See the Class Report Design for an explanation of data name and type syntax.
| Name | Description | Data Type |
|---|---|---|
| no-ff | Boolean |
| Member Name | Scope | Dynamic Dispatch | Must Override | Must Use Parent Implementation | Description \ Prototype |
|---|---|---|---|---|---|
| Set Create Merge Commit | public | FALSE | FALSE | FALSE |  |
| Merge | public | TRUE | FALSE | FALSE |  |
| Perform a merge of the "Target" into the current branch. If Target is not specified, then the branch will merge "the remote-tracking branches that the current branch is configured to use as its upstream". See https://git-scm.com/docs/git-merge for more details. The Status Message is for display only, and cannot be guaranteed for use with scripting. | |||||