[bisq-network/bisq] Improve instructions and wording (PR #5994)

[Christoph Atteneder]

> > @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)
<img width="1055" alt="Bildschirmfoto 2022-01-25 um 10 26 55" src="https://user-images.githubusercontent.com/170962/150950412-80635fde-60cc-4601-b1c9-bb2efaa219fc.png">
Change one commit to squash it with the other commit. Using `i` command to edit.
<img width="1045" alt="Bildschirmfoto 2022-01-25 um 10 27 15" src="https://user-images.githubusercontent.com/170962/150950521-bd544e99-4f75-44cb-abeb-1cfabe6cc452.png">
Click `ESC` and write `wq!` to save your changes.
<img width="1098" alt="Bildschirmfoto 2022-01-25 um 10 27 25" src="https://user-images.githubusercontent.com/170962/150950709-2665b3d2-760d-470b-8834-96923ecc60b2.png">
Adapt the commit message. I only deleted one of the messages by using the `dd` command for deleting lines.
<img width="1113" alt="Bildschirmfoto 2022-01-25 um 10 27 48" src="https://user-images.githubusercontent.com/170962/150950886-34df96f6-04c3-4e5b-beb0-b92ec74bd8bb.png">
Click `ESC` and write `wq!` to save your changes.
<img width="450" alt="Bildschirmfoto 2022-01-25 um 10 27 59" src="https://user-images.githubusercontent.com/170962/150950991-05019e52-2ff9-437e-b654-460da64dec2f.png">
All squashed correctly. To be sure I checked with `git log` the commit history.
<img width="543" alt="Bildschirmfoto 2022-01-25 um 10 28 15" src="https://user-images.githubusercontent.com/170962/150950997-8b171e43-588e-41da-b0ec-5ccebc22ae55.png">
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`

-- 
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/5994#issuecomment-1020989558
You are receiving this because you are subscribed to this thread.

Message ID: <bisq-network/bisq/pull/5994/c1020989558 at github.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20220125/d03425b5/attachment.htm>