Skip to content

Add branch merge strategies #2433

@ForeverAngry

Description

@ForeverAngry

Feature Request / Improvement

Add merge strategies commonly used in version control systems to pyiceberg. Motivated by some of the discussion found here #2428:

  1. MERGE: creating a merge commit that preserves history of both branches
  2. SQUASH: condenses all commits from source branch into a single clean commit on target branch
  3. REBASE: creates linear history by replaying commits from source branch on top of target branch
  4. CHERRY_PICK: selects and applies specific individual commits from one branch to another
  5. FAST_FORWARD: moves target branch pointer forward when no divergent commits exist (no merge commit needed)

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