Documentation ¶
Index ¶
Constants ¶
This section is empty.
Variables ¶
View Source
var AllCommitMarkers = []CommitMarker{ CommitMarkerIgnore, CommitMarkerConflictSkip, CommitMarkerConflictApply, }
AllCommitMarkers is a collection of all commit markers supported
View Source
var AllConflictInfos = []ConflictInfo{
&contentConflictInfo{},
&deleteModifyConflictInfo{},
&deleteRenameConflictInfo{},
&renameRenameConflictInfo{},
&renameDeleteConflictInfo{},
&modifyDeleteConflictInfo{},
}
AllConflictInfos is a collection of all merge conflict infos supported
View Source
var SyncCommitBodyHeader = strings.ToUpper(utils.ProjectName)
SyncCommitBodyHeader is a keyword that can be used to prefix a line in the body message of a commit for specifying metadata about the sync process relative to that commit
Functions ¶
Types ¶
type CommitMarker ¶
type CommitMarker string
const ( // IgnoreCommitMarker is a keyword that can be used for signaling that a given // commit should be ignored during the sync process. CommitMarkerIgnore CommitMarker = "SYNC_IGNORE" // CommitMarkerConflictSkip is a keyword that can be used for signaling that a given // commit should be skipped in case of a merge conflict CommitMarkerConflictSkip CommitMarker = "SYNC_CONFLICT_SKIP" // CommitMarkerConflictApply is a keyword that can be used for signaling that a given // commit should be always applied in case of a merge conflict. In case // of content conflict markers, the commit's markers are chosen. CommitMarkerConflictApply CommitMarker = "SYNC_CONFLICT_APPLY" )
func (CommitMarker) Description ¶
func (c CommitMarker) Description() string
func (CommitMarker) String ¶
func (c CommitMarker) String() string
Click to show internal directories.
Click to hide internal directories.