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

Add Stephanie Bodoff to AUTHORS #69881

Merged
merged 1 commit into from Sep 8, 2021
Merged

Add Stephanie Bodoff to AUTHORS #69881

merged 1 commit into from Sep 8, 2021

Conversation

ghost
Copy link

@ghost ghost commented Sep 7, 2021

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ghost ghost requested review from arulajmani and jlinder and removed request for arulajmani September 7, 2021 18:45
Copy link
Collaborator

@jlinder jlinder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Stephanie. Can you merge your commits into a single commit and then force-push to the branch? This will make it so the PR will follow our philosophy for how we write commits.

@ghost
Copy link
Author

ghost commented Sep 7, 2021

Hi Stephanie. Can you merge your commits into a single commit and then force-push to the branch? This will make it so the PR will follow our philosophy for how we write commits.

Hi Stephanie. Can you merge your commits into a single commit and then force-push to the branch? This will make it so the PR will follow our philosophy for how we write commits.

I'm used to squashing multiple commits into a single commit in the merge itself. I don't know how to do what you are asking. Could you help me with the procedure.

@ghost
Copy link
Author

ghost commented Sep 7, 2021

Hi Stephanie. Can you merge your commits into a single commit and then force-push to the branch? This will make it so the PR will follow our philosophy for how we write commits.

Hi Stephanie. Can you merge your commits into a single commit and then force-push to the branch? This will make it so the PR will follow our philosophy for how we write commits.

I'm used to squashing multiple commits into a single commit in the merge itself. I don't know how to do what you are asking. Could you help me with the procedure.

Nevermind. The docs team has instructions for this. I'll apply those.

@jlinder
Copy link
Collaborator

jlinder commented Sep 8, 2021

Apologies for not including info on how to fix this earlier. Here's how to fix it:

  1. Get your local branch to have only one commit that contains the subject line, the Release justification line and the Release note line. If your local branch looks like the branch that is in the PR, then you'll likely need to run git reset HEAD^ to get the commit 08727ee to be the branch head. Then amend the commit with git commit --amend to change the commit message.
  2. Push the new branch head to your remote with git push --force-with-lease FORK_NAME stephaniebodoff_authors

Release note: None
Release justification: Non-production code change
@ghost
Copy link
Author

ghost commented Sep 8, 2021

@jlinder I believe this is fixed now.

Copy link
Collaborator

@jlinder jlinder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed!

:lgtm:

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @stbof)

@jlinder
Copy link
Collaborator

jlinder commented Sep 8, 2021

bors r+

@craig
Copy link
Contributor

craig bot commented Sep 8, 2021

Build succeeded:

@craig craig bot merged commit 478a4d8 into cockroachdb:master Sep 8, 2021
@ghost ghost deleted the stephaniebodoff_authors branch September 10, 2021 22:52
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