Skip to content

Merge branches split up by separate rebases #5

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
Open
epage opened this issue Jul 31, 2021 · 0 comments
Open

Merge branches split up by separate rebases #5

epage opened this issue Jul 31, 2021 · 0 comments
Labels
enhancement Improve the expected

Comments

@epage
Copy link
Collaborator

epage commented Jul 31, 2021

If you rebase branches individually (like to resolve a conflict), the user might end up in a state where the parent branches are no parallel, rather than in-series.

Like with #3, it'd be good if we could identify and we-merge these branches,
@epage epage mentioned this issue Jul 31, 2021
Closed
@epage epage added the enhancement Improve the expected label Jul 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement Improve the expected
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@epage