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

Prune stale branches when fetching from remote #78

Merged
merged 1 commit into from
Feb 8, 2018
Merged

Prune stale branches when fetching from remote #78

merged 1 commit into from
Feb 8, 2018

Conversation

benjamb
Copy link
Contributor

@benjamb benjamb commented Feb 2, 2018

Fixes occasional error where local refs conflict with changes on the
remote:

error: some local refs could not be updated; try running
'git remote prune origin' to remove any old, conflicting branches

@aschmolck
Copy link
Contributor

Thanks for reporting the issue and sending an PR to fix it!

But I think instead of the more esoteric remote update --prune, we could just stick with fetch and add --prune, correct?

Fixes occasional error where local refs conflict with changes on the
remote:

    error: some local refs could not be updated; try running
    'git remote prune origin' to remove any old, conflicting branches
@benjamb
Copy link
Contributor Author

benjamb commented Feb 8, 2018

Yep, correct. Unsure why I didn't just resort to that, probably because I tend to use git remote update --prune rather than fetch or pull myself. Force pushed an update, it now sticks with fetch.

@jcpetruzza jcpetruzza merged commit 64a1582 into smarkets:master Feb 8, 2018
@jcpetruzza
Copy link
Contributor

Thanks for the fix!

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

Successfully merging this pull request may close these issues.

3 participants