Skip to content

git2go: Remove the `Conflicts` function

Karthik Nayak requested to merge 5098-feature-flag-git-merge-tree-for-listconflictfiles into master

The Conflicts function within git2go was used by the ListConflictFiles RPC to find conflicts between two object IDs. But now we've migrated to using git-merge-tree(1) as an alternative. Since the feature flag for the rollout is now enabled on production, we can remove the flag and remove the old code.

Since this is not breaking backward compatibility with rails, we don't have to wait for a subsequent release.

Part of #5098 (closed)

Edited by Karthik Nayak

Merge request reports