Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support Multiple branch merge #7125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 42 commits into
base: main
Choose a base branch
from
Draft

Support Multiple branch merge #7125

wants to merge 42 commits into from

Conversation

jar-of-salt
Copy link

@jar-of-salt jar-of-salt commented Sep 5, 2025 •
edited
Loading

Motivation

Relevant Issue: #5047

Changes

  • merge.c
    • git_merge now supports merging multiple branches using the octopus strategy

@jar-of-salt jar-of-salt mentioned this pull request Sep 5, 2025
Open
@jar-of-salt
merge octopus: fix initial test to accurately reflect goal repository…
9fa5c7f 
… state
@jar-of-salt
merge octopus: enable multiple merge conflicts to be inserted for oct…
fe3ab54 
…opus merge
@jar-of-salt
merge octopus: set to fail on merge conflict for octopus merge
77ae254
@jar-of-salt
merge octopus: set to fail on file merge conflict for octopus merge
720ebca
@jar-of-salt
merge octopus: add todo for test case
80e3d15
@jar-of-salt
merge octopus: add missing semicolon
d7e5cb2
@jar-of-salt
merge octopus: disallow merge conflicts; clean up octopus-specific er…
b03ba10 
…ror logic
@jar-of-salt
merge octopus: revert changes to queue difference (it was working for…
176ce1f 
… the octopus case as-is); iteration over all possible merge conflict trios moved to git_merge_diff_list__find_differences_multiple
@jar-of-salt
merge octopus: update basic merge octopus test case
f837350
@jar-of-salt
merge octopus: move octopus test to its own directory
82366b2
@jar-of-salt
merge octopus: handle resetting iterators for octopus comparison
174bcd0
@jar-of-salt
merge octopus: add failure test repo
43f4085
@jar-of-salt
merge octopus: add failure test case
14c7ed8
@jar-of-salt
merge octopus: clean up octopus failure test
5988753
@jar-of-salt
merge octopus: update 'git_merge_diff_list__find_differences' and 'gi…
6f991b8 
…t_merge__iterators' signatures
@jar-of-salt
merge octopus: update calls to 'git_merge__iterators' to reflect new …
f7e58c0 
…signature
@jar-of-salt
merge octopus: remove unused function from test
1865474
@jar-of-salt
merge octopus: update function call to match new signature
a7d1b7d
@jar-of-salt
merge octopus: remove resolved TODOs
a7beb3b
@jar-of-salt
merge octopus: cast type in call to 'iterator_for_annotated_commit' t…
86b370c 
…o fix const warning
@jar-of-salt
merge octopus: clean up unnecessary git files for octopus test resources
4ac905b
@jar-of-salt
merge octopus: add explanatory comment regarding iterator resets in '…
73cd43a 
…git_merge_diff_list__find_differences'
@jar-of-salt
merge octopus: add free for 'theirs' iterators in 'git_merge__iterators'
77003bd
@jar-of-salt
merge octopus: update 'merge_annotated_commits' to support multiple '…
6e2ffda 
…theirs' commits
@jar-of-salt
merge octopus: revert unnecessary fssary format edits
34c8fa4
@jar-of-salt
merge octopus: revert unnecessary format edits
793fe9d
@jar-of-salt
merge octopus: remove complete TODOs
f59ea8e
@jar-of-salt
merge octopus: correct merge base calculation for octopus case
9273c3b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jar-of-salt