gitmerge

Documentation

Index

• func GetCommits(repo *gogit.Repository, branchName string, remoteName string) (local, remote *object.Commit, err error)
• func MergeRemoteIntoBranch(repo *gogit.Repository, opts Options) error
• type IncludePathFunc
• type Options
• type UpdatedAtFunc

Functions

func GetCommits

func GetCommits(
	repo *gogit.Repository,
	branchName string,
	remoteName string,
) (local, remote *object.Commit, err error)

GetCommits returns the local and remote HEAD commits for the main branch.

func MergeRemoteIntoBranch

func MergeRemoteIntoBranch(repo *gogit.Repository, opts Options) error

MergeRemoteIntoBranch performs a 3-way last-write-wins merge of origin/main -> main.

Types

type IncludePathFunc

type IncludePathFunc func(gitPath string) bool

type Options

type Options struct {
	BranchName string
	RemoteName string

	AuthorName  string
	AuthorEmail string

	IncludePath IncludePathFunc
	UpdatedAt   UpdatedAtFunc

	Now func() time.Time
}

type UpdatedAtFunc

type UpdatedAtFunc func(gitPath string, data []byte) (time.Time, error)