NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-17 08:25:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
17.0
runbot/runbot_merge/changelog/2025-02/merge-method-acl.md
Xavier Morel c67bb64537 [ADD] *: fw=skipmerge 
Skipmerge creates forward-ports before the source PR is even merged.

- In a break from the norm, skipmerge will create forwardports even in
  the face of conflicts.
- It will also not *detach* pull requests in case of conflicts, this
  is so the source PR can be updated and the update correctly cascades
  through the stack (likewise for any intermediate PR though *that*
  will detach as usual).

Note that this doesn't really look at outstandings, especially as they
were recently updated, so it might need to be fixed up in case of
freakout, but I feel like that should not be too much of an issue, the
authors will just get their FW reminders earlier than usual. If that's
a hassle we can always update the reminder job to ignore forward ports
whose source is not merged I guess.

Fixes #418
2025-02-04 08:05:15 +01:00

438 B
Raw Permalink Blame History

IMP: allow non-reviewer employees to set the merge method on the PRs they create

Previously this was only allowed for reviewers actual (note: not necessarily the PR's own), but when the reviewer is busy and the PR is blocked on just the merge method it can be frustrating. However because the merge method has commit impliciation via the PR description (squash/merge/rebase-merge) giving access to any author might be a bit too relaxed.