Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • hgitaly hgitaly
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 45
    • Issues 45
    • 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

Due to a massive storm of spam, registration on this instance now requires explicit administrator approval. Sorry for the added friction, we're also looking into automatic filtering options.

  • heptapodheptapod
  • hgitalyhgitaly
  • Merge requests
  • !54

RepositoryService: implement FindMergeBase RPC

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Sushil Khanchi requested to merge topic/default/repositoryService-FindMergeBase into branch/default Mar 25, 2021
  • 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
Reviewers
Request review from
Time tracking
Source branch: topic/default/repositoryService-FindMergeBase