[WFLY-17183] Fix the description of the filesystem-realm update-key-p…

[anilabhabaral]

Jira: https://issues.redhat.com/browse/WFLY-17183

[anilabhabaral]

Hi @bstansberry @fjuma could you please review this PR ?

[fjuma]

Thanks for working on this @anilabhabaral! Just have some small comments.

[fjuma]

Just to be consistent with the name of the filesystem-realm used in the other examples, we should use filesystem-realm=fsRealm here instead of filesystem-realm=keystore.

[anilabhabaral]

Done.

[fjuma]

Same here, filesystem-realm=fsRealm.

[anilabhabaral]

Done.

[fjuma]

Thanks for the updates @anilabhabaral, looks good! Please squash the commits and then this should be good to go.

[anilabhabaral]

Hi @fjuma I am facing some issue while squashing the commits in my local repo.

I think repository's manager can squash all the commits in a pull request into a single commit by selecting "Squash and merge" on a pull request.It will be helpful if you could do this for me.

[cam-rod]

Hey @anilabhabaral, it looks the main branch was merged into yours, instead of the other way around. You'll need to delete the merge commit, and use an interactive rebase to squash the existing commits into a single one:

• Checkout to your branch, and run git reset HEAD~1 --hard, which will delete the merge commit. The "hard" option also deletes the changes that were staged by the reset, so this will give you a clean slate.
• Now checkout the main branch, and run git pull to get the latest changes, before switching back to your branch.
• Run git rebase -i main to start the interactive rebase onto the main branch. This will open a file to modify the commits in (you can set the editor with git config --global core.editor <editor_command>)
  • The screen that appears will explain how to properly modify the commits. The oldest commit is at the top, so replace pick in the second commit and down with fixup to squash all the commits into the first one, and discard the message.
  • Save the file and close it, the rebase will execute.
• Once the squash and rebase is complete, run git push -f to push the rewritten branch history.

A quick summary of commands:

git checkout WFLY-17183
git reset HEAD~1 --hard

git checkout main
git pull
git checkout WFLY-17183

git rebase -i main

# replace `pick` with `fixup` in all but the first commit, save and exit the file

git push -f

Let me know if you have any questions.

[fjuma]

Thanks very much @cam-rod for helping and thanks @anilabhabaral for the update! Looks good now.

[cam-rod]

Looks good @anilabhabaral, thanks!

[anilabhabaral]

Thanks @cam-rod , @fjuma for your help!

[anilabhabaral]

Hello @bstansberry could you please check whether this PR is ready for merge ?

[bstansberry]

@anilabhabaral Can you use 'git commit --amend' and fix the commit message, i.e. just the WFLY-17183 line? The current first line is what people reading history see and it's not useful info. Thanks.

Please ping @fjuma when ready; she is a WildFly merger and can merge it.

[anilabhabaral]

Thank you @bstansberry . I modified the commit message.

Hello @fjuma could you please check whether this PR is ready for merge ?

[anilabhabaral]

Thanks @fjuma