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

private-bower sometimes fails to refresh certain cached repositories … #203

Merged
merged 1 commit into from
Dec 1, 2015

Conversation

szabyg
Copy link

@szabyg szabyg commented Nov 27, 2015

…due to merge conflicts. These come from forced changes of the source repository head. Since we don't need to have a straight commit line anyways, we can simply hard reset the head to origin/master. Fixes #171

…due to merge conflicts. These come from forced changes of the source repository head. Since we don't need to have a straight commit line anyways, we can simply hard reset the head to origin/master. Fixes Hacklone#171
@Hacklone
Copy link
Owner

Hacklone commented Dec 1, 2015

Thanks for the PR :)

Hacklone added a commit that referenced this pull request Dec 1, 2015
private-bower sometimes fails to refresh certain cached repositories …
@Hacklone Hacklone merged commit e085e5a into Hacklone:1.1.6 Dec 1, 2015
@szabyg szabyg deleted the pull-conflict-fix branch December 3, 2015 10:39
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.

2 participants