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

Improve instructions and wording #5994

Merged
merged 1 commit into from
Jan 25, 2022

Conversation

w0000000t
Copy link
Contributor

Added case where user is in IDEA welcome screen, and there is no File > Settings menu available.

Fixes #replaceWithIssueNr, fixes #replaceWithIssueNr

Your PR description here.

@ripcurlx ripcurlx added this to the v1.8.3 milestone Jan 24, 2022
ripcurlx
ripcurlx previously approved these changes Jan 24, 2022
Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

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

utACK

@ripcurlx
Copy link
Contributor

@w0000000t You have to sign your commits before I can merge this PR. See https://help.github.com/articles/signing-commits-using-gpg/

@w0000000t
Copy link
Contributor Author

@w0000000t You have to sign your commits before I can merge this PR. See https://help.github.com/articles/signing-commits-using-gpg/

I am sorry for the results; been this close to just give up, spent more than two hours on this signature stuff. Never used Java before, and pretty much same level with github as well.
So 3 commits instead of one is the best I could do for now 😞

Added use-case where user is in IDEA welcome screen,
and there is no `File > Settings` menu available.
@ripcurlx
Copy link
Contributor

@w0000000t You have to sign your commits before I can merge this PR. See https://help.github.com/articles/signing-commits-using-gpg/

I am sorry for the results; been this close to just give up, spent more than two hours on this signature stuff. Never used Java before, and pretty much same level with github as well. So 3 commits instead of one is the best I could do for now 😞

No worries - git can be a hell in the beginning and especially using rebase. Here is what I did to squash your commits:

git rebase -i HEAD~2 (to change your last two commits, the third is just a merge commit)
Bildschirmfoto 2022-01-25 um 10 26 55
Change one commit to squash it with the other commit. Using i command to edit.
Bildschirmfoto 2022-01-25 um 10 27 15
Click ESC and write wq! to save your changes.
Bildschirmfoto 2022-01-25 um 10 27 25
Adapt the commit message. I only deleted one of the messages by using the dd command for deleting lines.
Bildschirmfoto 2022-01-25 um 10 27 48
Click ESC and write wq! to save your changes.
Bildschirmfoto 2022-01-25 um 10 27 59
All squashed correctly. To be sure I checked with git log the commit history.
Bildschirmfoto 2022-01-25 um 10 28 15
Last step I force pushed the changes to your branch with: git push --force w0000000t idea-import_improve. In your case it probably would be git push --force origin idea-import_improve

Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

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

ACK

@ripcurlx ripcurlx merged commit f905d7f into bisq-network:master Jan 25, 2022
@w0000000t
Copy link
Contributor Author

I have no shame admitting that the above post looks like Vogon dialect to me, but I understand you put a lot of efforts in my place 🙇

@w0000000t w0000000t deleted the idea-import_improve branch January 25, 2022 21:16
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