New issue
Advanced search Search tips
Starred by 2 users

Issue metadata

Status: Released
Owner: ----
Closed: Jan 2016



Sign in to add a comment
link

Issue 3742: Rebase if Necessary strategy is useless for commit chains

Reported by org...@gmail.com, Jan 2 2016

Issue description

Affected Version: 2.11, 2.12

What steps will reproduce the problem?
1. Create several dependent commits, with real dependencies (e.g. changing the same line)
2. Push them to a project configured with "Rebase if Necessary" strategy.
3. All the commits except the first one are marked as "Cannot merge"

What is the expected output? What do you see instead?
All the commits should be mergeable.

Please provide any additional information below.
The mergeability test is based on cherry picking of each change. This is obviously wrong for commit chains.
 

Comment 2 by org...@gmail.com, Jan 19 2016

This can be closed. Thanks.

Comment 3 by ekempin@google.com, Jan 19 2016

Project Member
Labels: FixedIn-2.11.6
Status: Submitted

Comment 4 by david.pu...@gmail.com, Feb 27 2018

Status: Released (was: Submitted)

Sign in to add a comment