Skip to content

In-memory merges via Git2Go

Patrick Steinhardt requested to merge pks-git2go-merge into master

This MR implements in-memory merges via our new gitaly-git2go. Given two commits, the command performs a merge of both commits without requiring a worktree.

Eventually, this new feature is expected to replace our current merge implementation of the OperationService making use of worktrees. As a result, merges should become much faster.

Merge request reports