Skip to content

Change dev Guidance To Rebase #599

Description

@TimothyWillard

Currently we use both rebases and merge commits for pulling PRs into dev which can create a headache for updating PRs using either method. We should stick to a single method for pulling PRs into dev and main.

  1. Need to add a note to the development documentation that we prefer "rebase and merge" over "create a merge commit".
  2. Also should investigate branch rules for enforcing said preference, I know it is possible and have done it before but need to decide on the set of rules that we would like.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    documentationRelating to ReadMEs / gitbook / vignettes / etc.enhancementRequest for improvement or addition of new feature(s).low priorityLow priority.meta/workflowRelating to CI / issue templates / testing frameworks / etc.quick issueShort or easy fix.

    Type

    Projects

    No projects

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions