Skip to content

RepositoryService: implement FindMergeBase RPC

Sushil Khanchi requested to merge topic/default/repositoryService-FindMergeBase into branch/default

After spending some time with Gitaly and Rails side, found that it's all about returning the gca (greatest common ancestor) of two revisions, which will be used as Base in a 3-way merge.

Not very important I guess but, a Note as per Gitaly: FindMergeBaseRequest can accept more than two revisions (but that's preserved for the future so that later we don't require to make changes in the proto file) in the cases of octopus merges.

Closes #26 (closed)

Edited by Sushil Khanchi

Merge request reports