Skip to content

GitLab

  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • hgitaly hgitaly
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 39
    • Issues 39
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 2
    • Merge requests 2
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • heptapod
  • hgitalyhgitaly
  • Merge requests
  • !54

Merged
Created Mar 25, 2021 by Sushil Khanchi@khanchi97🐨Maintainer

RepositoryService: implement FindMergeBase RPC

  • Overview 15
  • Commits 4
  • Pipelines 8
  • Changes 3

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 Apr 02, 2021 by Sushil Khanchi
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: topic/default/repositoryService-FindMergeBase