Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Script doesn't know rebased branches have been merged #4

Open
connorshea opened this issue Dec 18, 2018 · 0 comments
Open

Script doesn't know rebased branches have been merged #4

connorshea opened this issue Dec 18, 2018 · 0 comments

Comments

@connorshea
Copy link

In some cases git will not know that a branch has been merged because your local version of the branch differs from the copy of the branch that was merged.

For example, let's say User A checked out Branch A, then User B checked out Branch A and rebased it to squash some of the commits into a larger commit, then User B merges Branch A into the default branch (let's say master) and deletes Branch A from your GitHub/GitLab repo. git on User A's machine doesn't think Branch A was merged into master because the commit SHA of the latest commit on User A's copy of Branch A doesn't match any of the commits that are now in master.

Unfortunately I'm not sure of a good way to fix this issue, short of adding a flag that would let you delete any branches without upstream counterparts (this would have the side effect of deleting local branches you haven't pushed yet, which isn't great).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant