Skip to content

topolvm.io#592

Merged
llamerada-jp merged 1 commit intomainfrom
topolvm.io4
Nov 16, 2022
Merged

topolvm.io#592
llamerada-jp merged 1 commit intomainfrom
topolvm.io4

Conversation

@bells17
Copy link
Copy Markdown
Contributor

@bells17 bells17 commented Nov 10, 2022

This is a merge PR for reducing the number of commits for #539

The below commands created this PR:

$ git checkout main
$ git pull
$ git checkout topolvm.io
$ git merge main
$ git push
$ git diff main > /tmp/topolvm.io.patch
$ git checkout main
$ git co -b topolvm.io4
$ git apply /tmp/topolvm.io.patch
$ git add .
$ git commit -m "topolvm.io"
$ git push

## About the legacy flag

In https://github.com/topolvm/topolvm/pull/539, the domain name which is used for CRD and other purposes was changed from topolvm.cybozu.com to topolvm.io.
In https://github.com/topolvm/topolvm/pull/592, the domain name which is used for CRD and other purposes was changed from topolvm.cybozu.com to topolvm.io.
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@peng225 peng225 mentioned this pull request Nov 11, 2022
@bells17 bells17 marked this pull request as ready for review November 11, 2022 00:31
@bells17 bells17 requested a review from a team as a code owner November 11, 2022 00:31
@peng225 peng225 requested review from llamerada-jp, nbalacha and peng225 and removed request for daichimukai and pluser November 11, 2022 01:36
nbalacha
nbalacha previously approved these changes Nov 11, 2022
@peng225 peng225 self-requested a review November 11, 2022 06:09
@peng225 peng225 dismissed a stale review November 11, 2022 06:10

Operation mistake.

Comment thread docs/maintenance.md Outdated
@nbalacha
Copy link
Copy Markdown
Contributor

nbalacha commented Nov 11, 2022

What I usually do when I need to change something in a commit is the following:
git reset --soft HEAD~n where n=number of commits
Make the changes and git add
git commit again
git push -u origin branch name --force

This will overwrite the branch head so I can use the same PR. It may be a way to proceed with these changes instead of creating a new PR.

@bells17
Copy link
Copy Markdown
Contributor Author

bells17 commented Nov 12, 2022

What I usually do when I need to change something in a commit is the following:

Thank you. I never tried the git reset --soft command.
I'll try these commands the next time.

Copy link
Copy Markdown
Contributor

@llamerada-jp llamerada-jp left a comment

Choose a reason for hiding this comment

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

This PR looks good. Would you please squash this PR after other reviewers approve?

@peng225
Copy link
Copy Markdown
Contributor

peng225 commented Nov 15, 2022

LGTM. I will approve it after you squashed it.

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