Skip to content
Snippets Groups Projects

RepositoryService: implement FindMergeBase RPC

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

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading