blob: 1e17aa7b11a5cc2d504d8488c07093afec374e66 [file] [log] [blame] [view] [edit]
Plugin to allow automatically merging changes from one branch to another based
on a config file.
When the plugin detects a patchset has been created, it will
merge downstream until it hits a merge conflict. On the
conflicting merge, it will vote -1 on a configurable label
and provide instructions to resolving the merge conflict.
The plugin will put all the auto-created changes in the
same topic as the original change (or create a topic if
none exists). If a user updates the topic, it will update
the topic of all the downstream merges.
If there are existing downstream merges from a previous
automerged patchset, it will update them all.
A UI button "Recreate automerges" has been added so that users can skip
downstream merges. Unchecking a branch's checkbox will skip that branch and
all automerges downstream of that branch.
The plugin can be configured to perform cherry-picks instead of merges.