[go: up one dir, main page]

[AC-345] Do not allow merging into branches other than `develop`

Splitting up a large change into multiple pull requests can make it easier to review. However, if all of the PRs merge into {{develop}}, the change sets will be cumulative: PR#N+1 will include all the changes of PR#N plus its own changes. Alternatively, PR#1 can merge into {{develop}}, PR#2 can merge into {{pr-1}} (PR#1’s branch), etc. If {{pr-1}} is deleted once PR#1 is merged, GitHub automatically updates PR#2 to merge into {{develop}}. This configuration means each PR only shows it’s changes.

However, if {{pr-1}} is not deleted before PR#2 is merged, then PR#2 is not merged into {{develop}}, which is a problem. To prevent this while still allowing this workflow, I will create a Workflow/CI job that fails if the target is not {{develop}}. This will prevent PRs from being merged into branches other than {{develop}}.

Issue metadata

  • Issue type: Task
  • Priority: Medium
  • Parent issue: [AC-324] CI/CD and project management automation
  • Fix versions: 0.3