Skip to content

Safely handle pulling squashed PRs #28

@epage

Description

@epage

  • I have searched the discussions
  • I have searched the existing issues

Version

0.1.0

Use Case

  1. My PR was squashed-merged
  2. I perform git stack --pull
  3. I want my local branch automatically deleted, instead it skips rebase because of conflicts

Requirements

  • No data loss
  • Squash-merged branch is deleted
  • All dependent branches rebase safely on master

Possible Solutions

Because of that, git rebase-update will attempt to squash your conflicted branch to see if the squashed version applies cleanly to its upstream.

https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/git-rebase-update.html

#4 is about a way to unsafely handle pulling squashed PRs

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions