"brian m. carlson" writes:
> With the strategies that use 3-way merge (including the default,
> 'recursive'),
> -if a change is made on both branches, but later reverted on one of the
> -branches, that change will be present in the merged result; some people find
> -this behavior confusing. It
The documentation for merge strategies noted that if a change was
reverted on only one branch of a merge, the resultant merge would
contain the change. However, similar surprising behavior can occur
where cherry-picking only one commit from a series to the other branch
can cause conflicts.
Adjust
2 matches
Mail list logo
