Skip to content

Support octopus merges (i.e. more than 2 parents) #12

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.

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

Open
mlange-42 opened this issue Dec 25, 2020 · 2 comments
Open

Support octopus merges (i.e. more than 2 parents) #12

mlange-42 opened this issue Dec 25, 2020 · 2 comments
Labels
enhancement New feature or request

Comments

@mlange-42
Copy link
Owner

Currently, only two parrents are supported.

@mlange-42 mlange-42 added the enhancement New feature or request label Dec 25, 2020
@mlange-42 mlange-42 self-assigned this Dec 25, 2020
@mlange-42 mlange-42 removed their assignment Jan 20, 2023
@eMPee584
Copy link

mmh 🤔 .. so what was the difficulty you came accross supporting these?

@carlobellettini
Copy link

carlobellettini commented Apr 4, 2025

only the first two branches are correctly connected, while the remaining branches are not shown as merged into the main graph. This results in an incomplete visualization of the expected merge structure

gitgraph one:

 ○<┐    9d3c65e (HEAD -> main) Merge branches 'A', 'B' and 'C'
 ● │    a7bfc3b (A) AA
 │ │ ●  fbef574 (C) D
 │ │ ●  5e99f7a C
 │ ● │  d5b4a12 (B) B
 ├─┴─┘  
 ●      31ebe88 A

fbef574 is not connected

here the correct one:

*-.   [04 09:24.48] | Merge branches 'A', 'B' and 'C'    (HEAD -> main)
|\ \  
| | * [04 09:22.39] | D    (C)
| | * [04 09:22.27] | C   
| * | [04 09:22.15] | B    (B)
| |/  
* / [04 09:24.24] | AA    (A)
|/  
* [04 09:21.18] | A   

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

3 participants