Skip to content
Snippets Groups Projects
Commit 3946ee4e authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

topic: add a `exp….topic.linear-merge` option to allow some oedipus

If this option is set to `from-branch`, a user can call `hg merge some-topic`
from a bare branch even if `some-topic` is a direct descendant of the current
working copy parents. This was previously denied if the changesets was on the
same branch, since the result would be an "oedipus merge".

Some user have been requesting this, and this type of merge is one of Gitlab
standard way of merging a "Merge Request". That new option will unlock issue
`heptapod#200` and make this mode available for those who wants it.
parent d77d61c9
No related branches found
No related tags found
2 merge requests!273compatibility branches for 10.1.0,!265topic: add a `exp….topic.linear-merge` option to allow some oedipus
Pipeline #38015 passed
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment