Skip to content

Merge Delegate Class Documentation

Chris Cilino edited this page Dec 18, 2020 · 1 revision

This document was created by the PetranWay Autodocumentation Utility.

Charter

This class is used to perform "git merge" commands. This class can be overridden to provide variations in the handling of the merge process as required.

Location

C:\PetranWay\Reuse Development\LabVIEW_Git\Merge Operations\Interface\Merge-Delegate.lvclass

Private Data

See the Class Report Design for an explanation of data name and type syntax.

Name
No Data For this Class

Members

Member Name Scope Dynamic Dispatch Must Override Must Use Parent Implementation Description \ Prototype
CMD Return protected FALSE FALSE FALSE CMD Returnc.png
Execute Git Command protected FALSE FALSE FALSE Execute Git Commandc.png
This VI provides a wrapper for the Git Implementation "Execute Command" method, which is Community scope. It is used to allow the Git-Merge class hierarchy to act as delegates for the purpose of merging branches.
Merge public TRUE TRUE, FALSE Mergec.png
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.