gitutil

package
v0.80.0 Latest Latest
Warning

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

Go to latest
Published: Jan 27, 2026 License: Apache-2.0 Imports: 3 Imported by: 0

Documentation

Index

Constants

This section is empty.

Variables

This section is empty.

Functions

func MergeWithBailOnConflict

func MergeWithBailOnConflict(path, branch string) (bool, error)

MergeWithBailOnConflict attempts to merge a branch into the current branch and aborts if there are conflicts. Returns true if merge was successful, false if there were conflicts (but abort succeeded). Returns an error only if both merge and abort fail.

func MergeWithTheirsStrategy

func MergeWithTheirsStrategy(path, branch string) error

MergeWithTheirsStrategy merge a branch into the current branch using the "theirs" strategy.

Types

This section is empty.

Jump to

Keyboard shortcuts

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