Skip to content

Handle diverged branch#140

Merged
foriequal0 merged 2 commits intomasterfrom
diverged
Aug 7, 2020
Merged

Handle diverged branch#140
foriequal0 merged 2 commits intomasterfrom
diverged

Conversation

@foriequal0
Copy link
Copy Markdown
Owner

@foriequal0 foriequal0 commented Aug 7, 2020

breaking changes
--delete stray doesn't implies stray-local, stray-remote anymore. It is bound to the local branch.
--delete stray-local, --delete stray-remote is deleted.
--delete diverged is added.

before

Branches that will remain:
  local branches:
    master
  remote references:
    origin/HEAD
    origin/master
    git@github.com:someone/fork, refs/heads/some-branch [merged, but: filtered]

Delete merged local branches:
  - some-branch
Confirm? [y/N]

after:

Branches that will remain:
  local branches:
    master
    some-branch [diverged with git@github.com:someone/fork, refs/heads/some-branch, but: filtered]
  remote references:
    origin/HEAD
    origin/master
    git@github.com:someone/fork, refs/heads/some-branch [diverged with some-branch, but: filtered]

You need to pass --delete diverged or --delete diverged:git@github.com:someone/fork to delete both of them.

resolves: #132
resolves: #139

@foriequal0 foriequal0 merged commit 1aa4e3b into master Aug 7, 2020
@foriequal0 foriequal0 deleted the diverged branch August 7, 2020 06:18
@foriequal0 foriequal0 added the bug Something isn't working label Aug 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

breaking changes bug Something isn't working enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Branches with hub-cli style checkout does not check whether it is synched with the remote one Diverged branch?

1 participant