Skip to content

[brainstorming] git merge strategy for syncing with upstream #499

Description

@instagibbs

A single PR should contain a single merge commit in "digestible" chunks. PR title should be prepended by [<local_branch_name> MERGE]. Ideally this is done ~once per month. If the merge commit compiles and passes all tests, the merge commit message is prepended with UPSTREAM MERGE:. If the resulting merge contains compilation/test failures, the merge commit is prepended by UPSTREAM MERGE BROKEN: and these issues should be fixed in separate commits on top, with their commit message prepended MERGE-FIX:.

This allows for easy history reading(discrete fixes with clear reasoning), and bisection rules to skip known bad sections.

Example with "clean" merge that passes tests: #500
Example with "broken" merge that fails a single functional test, with fix appended: #501

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

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions