search

monero-project / monero-site

https://getmonero.org
BSD 3-Clause "New" or "Revised" License
288 stars 391 forks source link

Update Legal, monero compile link and grammar #2333

Closed jermanuts closed 2 months ago

jermanuts commented 3 months ago

Should we also remove "Password Protected Areas" as it is irrelevant because the forum is now inaccessible?

Also please revise the grammar changes I made.

netlify[bot] commented 3 months ago

Deploy Preview for barolo-time-757cf9 ready!

Built without sensitive environment variables

Name Link
Latest commit 288dae46608935261218ec9db4882660b387ccd2
Latest deploy log https://app.netlify.com/sites/barolo-time-757cf9/deploys/66af96c3ef7fa100086a0e7b
Deploy Preview https://deploy-preview-2333--barolo-time-757cf9.netlify.app
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

jermanuts commented 3 months ago

LGTM, thanks for all the reviews!

plowsof commented 3 months ago

while we wait for the legal department to approve the changes, i notice this is your 2nd pull request from master branch and you where reluctant to squash/edit the previous one, have times changed?

nahuhh commented 3 months ago

what plowsof is trying to say:

  1. Please squash commits into 1
  2. (for next time) please always create a new branch on your repo and push pr from there

and i'll add

  1. Please name pr and commits like sourcefolder: change made so, legal: update index.md

I can leave my approval (pending 1, 2 and preferably 3)

nahuhh commented 3 months ago

To squash

  1. Update your local branch. Replace with the name of your remote. If you only have 1 repo cloned, should be "origin" git pull <remote> master
  2. git rebase -i HEAD~7 this will show a list of the 7 commits. They will say pick <commit msg>. For the bottom 6, replace pick with squash and then save the file
  3. it will show a new file, and ask you to edit the commit msg. it will display all 7 messages. Delete them and replace with legal: update index.md, then save the file
  4. git push -f to push the changes
jermanuts commented 3 months ago

@nahuhh please tell me it worked (and didn't miss any commit), had to use Vim 😭 and oh I hate Git.

I might close this PR and open a new one with all edits instead of suffering

nahuhh commented 3 months ago

Looks like it went well 🙏 thank you

nahuhh commented 3 months ago

If you make the latest changes locally, you can edit the original commit

git add index.md
git commit --amend --no-edit
git push <youruser> -f