Skip to content

Move all rugged operation for ff_merge inside Gitlab::Git

Alejandro Rodríguez requested to merge gitaly-ff-merge-preparation into master

What does this MR do?

Move all rugged operation for ff_merge inside Gitlab::Git.

Are there points in the code the reviewer needs to double check?

No.

Why was this MR needed?

It sets us up to migrate this feature to Gitaly. See gitaly#680 (closed)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes gitaly#683 (closed)

Merge request reports