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 new test case for bz1894647 #189

Closed
wants to merge 0 commits into from

Conversation

gitPo1son
Copy link

Playbook will fail when lv size is equal to vg size

Signed-off-by: Changhui Zhong [email protected]

@richm
Copy link
Contributor

richm commented May 4, 2021

[citest pending]

@richm
Copy link
Contributor

richm commented May 4, 2021

[citest bad]

@richm
Copy link
Contributor

richm commented May 4, 2021

[citest pending]

@richm
Copy link
Contributor

richm commented May 14, 2021

@gitPo1son please rebase

@richm
Copy link
Contributor

richm commented May 27, 2021

Can you rebase without a merge commit? e.g. something like this:

# make sure to commit or stash any working changes first
git checkout master
git pull
git checkout dev.czhong0121
git rebase master
# fix any rebase conflicts by doing
# edit file ... file
# git add file ... file  # files that were edited to fix rebase conflicts
# git rebase --continue

after you have done this, to remove the merge commit

git rebase -i master
# then remove the merge commit(s)

then push the commits:
git push -f gitPo1son dev.czhong0121

@gitPo1son
Copy link
Author

@richm Hi,Richard Megginson
I did some rebase operations today and accidentally deleted and closed the PR file. I am very sorry about that.

I noticed that you have merged and modified the conflicts I submitted, and the files of the upstream master branch are correct.thank you so much for doing this.

My master branch is synced with the upstream's master branch, and my dev branch dev.chzong0121 can be removed.
So don't have to resolve any conflict. next time I'll create a new dev branch if a new PR will be filed by myself.

Thanks

@richm
Copy link
Contributor

richm commented May 31, 2021

@richm Hi,Richard Megginson
I did some rebase operations today and accidentally deleted and closed the PR file. I am very sorry about that.

I noticed that you have merged and modified the conflicts I submitted, and the files of the upstream master branch are correct.thank you so much for doing this.

? The only merges I did, if any, were to your branch in your repo.

My master branch is synced with the upstream's master branch, and my dev branch dev.chzong0121 can be removed.
So don't have to resolve any conflict. next time I'll create a new dev branch if a new PR will be filed by myself.

Thanks

@gitPo1son
Copy link
Author

@richm Hi,Richard Megginson
I did some rebase operations today and accidentally deleted and closed the PR file. I am very sorry about that.
I noticed that you have merged and modified the conflicts I submitted, and the files of the upstream master branch are correct.thank you so much for doing this.

? The only merges I did, if any, were to your branch in your repo.

Thanks,got 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.

2 participants