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

Suppresses the runtime/sizeof cpplint error using Ben's suggestion via t... #197

Closed
wants to merge 1 commit into from
Closed

Suppresses the runtime/sizeof cpplint error using Ben's suggestion via t... #197

wants to merge 1 commit into from

Conversation

rudi-cilibrasi
Copy link

...he NOLINT directive.

@bnoordhuis
Copy link
Member

LGTM but can you update the commit log to conform to the template from CONTRIBUTING.md? Cheers.

@cjihrig
Copy link
Contributor

cjihrig commented Dec 23, 2014

This has moved to #202.

@rudi-cilibrasi you're able to update an existing PR. No need to open a new PR for every change.

@cjihrig cjihrig closed this Dec 23, 2014
@rudi-cilibrasi
Copy link
Author

Thanks Colin. I hope you don't mind a question related to this about git.
I am curious because I need to learn some more convenient ways to
collaborate in git. I can get by but I frequently wind up cloning the
whole repo all over just to get a clean commit. I was not sure how I could
update a commit log message without leaving a small mess (old commit still
there) without starting a new PR. I thought that --amend might be the only
way to do it however I wanted to find out if there might be another way?
I've used --amend to fix my name/email before but have not used it to fix
the commit log although it seems like a good fit.

On Tue, Dec 23, 2014 at 8:12 AM, Colin Ihrig notifications@github.com
wrote:

This has moved to #202 #202.

@rudi-cilibrasi https://github.com/rudi-cilibrasi you're able to update
an existing PR. No need to open a new PR for every change.


Reply to this email directly or view it on GitHub
#197 (comment).

Happy to Code with Integrity : Software Engineering Code of Ethics and
Professional Practice http://www.acm.org/about/about/se-code

@cjihrig
Copy link
Contributor

cjihrig commented Dec 23, 2014

Yes, git commit --amend would have been a good way to solve this problem. That would allow you to reword the commit message as Ben requested. Then you could do a force push up to your feature branch.

@bnoordhuis
Copy link
Member

@rudi-cilibrasi Also git rebase -i <tree-ish> to squash, reword or remove commits. CONTRIBUTING.md in the top-level directory goes into detail.

@nodejs-github-bot
Copy link
Collaborator

@nodejs-github-bot
Copy link
Collaborator

This was referenced Dec 28, 2020
eti-p-doray pushed a commit to eti-p-doray/node that referenced this pull request Aug 28, 2024
# Conflicts:
#	src/crypto/crypto_timing.cc
#	src/node_buffer.cc
#	src/node_external_reference.h
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.

4 participants