-
Notifications
You must be signed in to change notification settings - Fork 350
Commit
- Loading branch information
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
9 comments
on commit 602ced4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You also forgot the git tag.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@XhmikosR sorry for the mess, and thanks for fixing it!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@alexlamsl: what I don't get is, did you force push the master branch? If so, you should never do it. In fact, @vladikoff please enable branch protection for the master branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I made hiccup as I didn't test for Node.js 0.10
In the next iteration, I'll test it out properly via Pull Request.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've sent a PR in grunt-contrib-internal to bump the major version due to the 0.10 removal.
But please, never force push. And you could just reset the branch to the old state or ping me to do it.
Now it's a mess. I had to recreate the tags/releases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@XhmikosR lesson learnt - no more -f
May I ask how to reset a branch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You could use git reflog, find the hash, and git reset --hard to that. Again, this would need to be force pushed too, but it would be in order to fix the mess. If we have branch protection you cannot force push anyway so this wouldn't happen.
At any case, use PRs in the future, and CC me if you are not sure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the information.
What I did to master
was:
$ git commit --amend
$ git push -f -u origin master
I didn't think it would alter any history other than the latest commit, but obviously that's not the case.
Sorry again for the mess.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any change to a commit will change its hash. Be it the date, the commit message, anything.
If I had kept the repo locally, I would have fixed this, but unfortunately I hadn't kept it checked out.
@alexlamsl The spaces are needed. Also, you are not supposed to edit README.md manually; you run
grunt
after you bump the version