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

2.9.2 Release #6679

Merged
merged 8 commits into from
Nov 2, 2019
Merged

2.9.2 Release #6679

merged 8 commits into from
Nov 2, 2019

Conversation

etimberg
Copy link
Member

@etimberg etimberg commented Nov 2, 2019

Releases v2.9.2

bower.json Outdated Show resolved Hide resolved
dist/Chart.js Outdated Show resolved Hide resolved
@etimberg
Copy link
Member Author

etimberg commented Nov 2, 2019

Looks like those are cause we forked from the release branch

@etimberg
Copy link
Member Author

etimberg commented Nov 2, 2019

Perhaps we can delete them?

@benmccann
Copy link
Contributor

If you run git rebase --onto 2.9~9 2.9~8 2.9 it will drop the chartjs-ci commit and then you could force push the 2.9 branch. I don't think I'd have permission to do it

@etimberg
Copy link
Member Author

etimberg commented Nov 2, 2019

You should be able to, but either way I can do in ~ 2 hours

@benmccann
Copy link
Contributor

Here's what happens when I try:

remote: error: GH006: Protected branch update failed for refs/heads/2.9.
remote: error: Cannot force-push to a protected branch
To git@github.com:chartjs/Chart.js.git
 ! [remote rejected] 2.9 -> 2.9 (protected branch hook declined)
error: failed to push some refs to 'git@github.com:chartjs/Chart.js.git'

@etimberg
Copy link
Member Author

etimberg commented Nov 2, 2019

I can't either because we protected the branch. How about I do the following:

  1. unprotect
  2. force push
  3. reprotect

@benmccann
Copy link
Contributor

Sounds good

@etimberg etimberg merged commit 1d9be7e into release Nov 2, 2019
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.

None yet

3 participants