libmerge

package
v0.0.0-...-1908093 Latest Latest
Warning

This package is not in the latest version of its module.

Go to latest
Published: Nov 22, 2020 License: Apache-2.0 Imports: 5 Imported by: 0

Documentation

Index

Constants

This section is empty.

Variables

View Source
var (
	ErrWorktreeIsNotClean   = xerrors.Errorf("worktree is not clean")
	ErrConflictAfterMerging = xerrors.Errorf("conflicts occur")
)

Functions

func FastForward

func FastForward(branch, remote string, opt *types.Options) (err error)

func Start

func Start(branch, remote string, mergeOpt *MergeOptions, opt *types.Options) (err error)

Types

type MergeOptions

type MergeOptions struct {
	Author    *types.User
	Committer *types.User
}

Jump to

Keyboard shortcuts

? : This menu
/ : Search site
f or F : Jump to
y or Y : Canonical URL