aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/protocol/packp/ulreq_test.go
diff options
context:
space:
mode:
authorPaulo Gomes <paulo.gomes@suse.com>2024-03-09 09:00:21 +0000
committerPaulo Gomes <paulo.gomes@suse.com>2024-03-09 09:00:21 +0000
commit3ee5bc9dd308a5503d60cc26d17d7f10df28c37a (patch)
treecdc736274162b804e12d4bd55617b5811d470248 /plumbing/protocol/packp/ulreq_test.go
parent4bed23037f0e374d85bce1506e9df98ce0cfcd32 (diff)
downloadgo-git-3ee5bc9dd308a5503d60cc26d17d7f10df28c37a.tar.gz
git: Implement Merge function with initial FastForwardMerge support
Introduces the Merge function for merging branches in the codebase. Currently, the function only supports FastForwardMerge strategy, meaning it can efficiently update the target branch pointer if the source branch history is a linear descendant. Support for additional merge strategies (e.g., three-way merge) will be added in future commits. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>
Diffstat (limited to 'plumbing/protocol/packp/ulreq_test.go')
0 files changed, 0 insertions, 0 deletions