08:21:37 <ErCiccione> .merge+ 1246
08:21:38 <xmr-pr> Added
12:28:49 <thomasb06> if you tell me which file to modify to try to fix this issue, maybe I do it today: https://github.com/monero-project/monero-site/issues/941
12:29:02 <thomasb06> the site runs locally already
12:30:33 <moneromooo> What I do when I don't know these things is grep for a similar thing and see where it is. If you want to add a FAQ, grep for an existing one.
12:31:14 <thomasb06> well, grep in the github clone?
12:31:37 <moneromooo> Where else.
12:33:02 <thomasb06> Indeed, there is a match in the file "_i18n/en.yml"...
12:35:29 <thomasb06> There is a § about it in the Faq, do you know why the issue is still open?
12:46:11 * moneromooo has no idea
12:50:49 <thomasb06> Anyway I modified this file instead but it's in the .gitignore file: _site/resources/user-guides/verification-windows-beginner.html
12:51:13 <thomasb06> do you know where I can find the modifiable version?
12:52:00 <thomasb06> found: _i18n/en/resources/user-guides/verification-windows-beginner.md
12:53:23 <thomasb06> The file Gemfile.lock is in my 'git status', can I commit it?
12:53:58 <moneromooo> git log Gemfile.lock will show you whether others before did so.
12:54:58 <moneromooo> The name screams "I should not be in git" but I remember a lock file related to gem being a text file, because why not do things annoyingly.
12:58:24 <thomasb06> Others did so... For today, I resisted to the 'git add -a' temptation
12:59:26 <thomasb06> pushed, if you want to check it?
13:05:56 <moneromooo> Make a PR, and people with a clue about how the site works will :)
13:06:14 <moneromooo> Good call about not running add -a btw :)
13:09:14 <thomasb06> you were sort of screaming "don't add Gemfile.lock", hehe...
13:09:57 <thomasb06> seriously, I don't know how to make a PR but GitHub must have a link somewhere
13:12:51 <moneromooo> I'm not sure it should be added. I was just saying the ".lock" in name normally strongly hints not to, but the "Gem" in the name hints it might need to. Hence looking at git log to see.
13:30:25 <thomasb06> Pull request emited. As I'm doing this from work, this is for today... Thank you for your help, maybe Monday I'll do another small change
13:35:59 <ErCiccione> the  .lock file shouldn't be touched indeed.
13:36:37 <ErCiccione> it's there to make sure people don't have not compatible dependencies installed
13:37:21 <ErCiccione> "the Gemfile.lock makes your application a single package of both your own code and the third-party code it ran the last time you know for sure that everything worked"
13:37:50 <ErCiccione> thomasb06: btw on the readme there are instructions step by step for everything. Including editing user guides
13:38:14 <ErCiccione> wait you wanted to edit a faq. That's even easier
13:39:27 <ErCiccione> I actually have to update the part of the readme related to the FAQ, now it's easier than it used to be. But basically just take a look at the other entries and copy that structure
13:42:16 <thomasb06> ErCiccione apologies for not finding, but where is the step-by-step guide?
13:42:57 <ErCiccione> About user guides: https://github.com/monero-project/monero-site#how-to-make-a-user-guide
13:42:57 <thomasb06> also, I didn't particularly wanted to update the Faq but to close issue
13:43:01 <thomasb06> *issues
13:43:15 <thomasb06> wow, I'm not there yet
13:43:17 <ErCiccione> I have to update the instructions for the FAQ
13:43:49 <ErCiccione> that's appreciated tho, adding a faq should be quite straightforward. Take a look at other PRs doing the same thing to get an idea
13:44:23 <ErCiccione> like https://github.com/monero-project/monero-site/pull/1163
13:48:08 <thomasb06> the files in _18n/ seem to be in the .gitignore, aren't they?
13:49:16 <ErCiccione> They are not. The _site folder is in .gitignore
13:49:24 <thomasb06> understood
13:49:36 <ErCiccione> because that's the built website. You need to work on the source files
13:50:32 <thomasb06> btw, this issue 941 seems to be closed but is still in the list: https://github.com/monero-project/monero-site/issues/941
13:51:02 <thomasb06> There is an entry in the Faq but the issue is still there
13:54:00 <ErCiccione> The issue is till open. Where od you see the entry in the FAQ?
13:54:27 <thomasb06> about the issue 1025, being under linux, I can redo the screenshots. Do I add two files by GIMP'ing the old ones?
13:55:36 <thomasb06> This § doesn't answers the issue: https://web.getmonero.org/get-started/faq/#anchor-buy ?
13:55:47 <ErCiccione> There is a PR already open for that. You see it linked in the issue itself.
13:57:26 <ErCiccione> They are quite similar, yes. The already existent entry is not specific to xmr -> fiat. But yeah, seems unnecessary to have both
13:57:43 <thomasb06> GitHub is to new for me... This is the PR for the issue: https://github.com/monero-project/monero-site/pull/944 ?
13:57:48 <thomasb06> understood
13:58:39 <ErCiccione> wait i wrote it in the body of the issue itself:
13:58:50 <ErCiccione> "This question gets asked like 3 times a week on /r/monero. Worth making a dedicated answer or maybe we should just improve How can i get Monero? to include more info for the conversion from fiat. A mention to how to convert BTC -> XMR is probably good to have, since that's another very common question."
13:59:01 <ErCiccione> https://github.com/monero-project/monero-site/issues/941
13:59:53 <thomasb06> So the explanation is the Faq is not complete, this time I got it
14:01:21 <thomasb06> What would you like to add, maybe I can do it on Monday? Do you have an answer on r/morero I can almost copy-paste?
14:04:01 <ErCiccione> I don't know, i haven't thought about it. I think even just a short faq linking to the other one ("how can i get monero?") would be ok
14:05:35 <thomasb06> Maybe I'll do this next, let me bookmark your links
14:06:12 <thomasb06> to summarize, I need to add a "qimporting:" and  a "aimporting:" ?
14:09:13 <ErCiccione> To do what? and where?
14:09:55 <thomasb06> the file I need to add a fiat answer is _18n/en.yml
14:10:48 <thomasb06> all I need to do is add a "q21: How can I get Monero from fiat?" and a "a21: You can..."
14:12:52 <thomasb06> well, I'm modifying it right now... What would be your answer, from an exchange, for example cex.io but the fees are really high or p2p: localmonero.com, hudlhudl.com, ...
14:12:54 <thomasb06> ?
14:16:09 <ErCiccione> It's not only that. See the link i sent you above to PR 1163. And please avoid using numbers in the tml key. Better a short and clear word (for example qxmrfiat axmrfiat or something like that)
14:16:46 <ErCiccione> Better to not link to specific exchnages, we have a list in the merchants page
14:26:50 <thomasb06> ErCiccione the command "git add _i18n/en.yml" doesn't produce any effect. Do you have an idea about I could have broken? It workd this
14:27:07 <thomasb06> it worked this afternoon..
14:28:03 <moneromooo> It's a noop if the file is unchanged.
14:28:07 <moneromooo> Is it unchanged ?
14:28:31 <thomasb06> Yes, I added a few lines: qxmrfiat: How can I get Monero from fiat?
14:28:57 <thomasb06> well, it is changed
14:32:27 <thomasb06> Arg, it's on GitHub already... Now I pull-request it
14:41:44 <thomasb06> It seems GitHub is considering both modifications I made today a single PR: https://github.com/monero-project/monero-site/pull/1248
14:42:19 <thomasb06> The entry in the Faq is made though: "axmrfiat: You can buy Monero from an institutional exchange but the fees can be very high. Also, you can buy XMR from local exchanges, i.e. peer-2-peer transaction sites, but beware of scammers as usual..."
14:43:17 <thomasb06> moneromooo is it ok for you?
14:44:03 <moneromooo> You probably pushed to the same branch. If you have two changes you want to kepe separate, make both of these changes on separate branches.
14:44:47 <thomasb06> wow, I don't know how to do this
14:47:31 * thomasb06 has to go
14:47:46 <moneromooo> git checkout master; git branch pr1; git checkout pr1; edit files; git add somefile1 somefile2; git commit; git push origin pr1; git checkout master
14:47:59 <ErCiccione> thomasb06: beside that, you are still changing only one file, but that's not the only thing needed to add a FAQ entry. see how https://github.com/monero-project/monero-site/pull/1163 changes 2 files
14:48:00 <moneromooo> Them same with pr2.
14:53:29 <thomasb06> moneromooo many thanks
14:53:49 <thomasb06> ErCiccione the second file is "s/syncronize/synchronize/" ?
14:55:56 <ErCiccione> you have to edit  _i18n/en.yml  and  get-started/faq/index.md
14:56:50 <thomasb06> ErCiccione well, I really don't see any "get-started/faq/index.md" in the PR 1163
14:57:50 <thomasb06> found
14:57:53 <ErCiccione> https://github.com/monero-project/monero-site/pull/1163/files#diff-e5bd0737f1b112f6d6235ea391f7f5038be7aadd1bb8062abe1741f6d9409d2e
14:58:53 <thomasb06> "Files changed 2", indeed...
15:08:34 <thomasb06> Pushed, this is it?
15:25:57 <ErCiccione> you still used master. You have to remove th changes you made to the verification-windows-beginner.md  file and change name of the commit and title of the PR
17:33:08 <thomasb06> Hello. How can I fix this PR: https://github.com/monero-project/monero-site/pull/1248
17:33:22 <thomasb06> Maybe I can delete it?
17:43:28 <asymptotically> thomasb06: did you want to just keep your 2 most recent commits?
17:45:03 <thomasb06> Apparently the first one is not necessary anymore. But if I cancel it, I would also need to change the name of the PR?
17:45:38 <thomasb06> Say yes, how to keep only the last two..
17:46:15 <asymptotically> there's an edit button on the github webpage to change the title of your PR, as for the commits, you should be able to type `git rebase -i HEAD~4`, and then change `pick` to `drop` in front of the commits you want to get rid of
17:46:18 <asymptotically> and then `git push --force`
17:56:00 <thomasb06> Thanks
17:56:13 <thomasb06> Can it all be done from GitHub?
17:59:10 <asymptotically> not that I know of :(
18:00:46 <thomasb06> Do this sound fit: https://stackoverflow.com/questions/36168839/how-to-remove-commits-from-a-pull-request
18:01:07 <thomasb06> ?
18:02:13 <asymptotically> you don't want to do what the first answer suggests (git revert) because this will create even more commits. it would be best if you did what the second answer describes (git rebase interactive and drop)
18:03:14 <thomasb06> As I'm not on the computer that has the clone, the best is to wait... Thank you
18:04:33 <thomasb06> By the way, how do you "replace picx with drop"?
18:04:55 <thomasb06> For the moment, I don't know what it means...
18:05:13 <thomasb06> It's answered in the comments, never mind
18:05:19 <asymptotically> when you run that command, it opens up your editor and you'll get a line that says something like "pick <commit hash> <commit message>"
18:06:01 <thomasb06> Indeed, this is what Slim answered too
18:06:18 <thomasb06> Cheers, good week-end
18:07:01 <asymptotically> :) happy weekend to you too
20:39:17 <Snipa> .fork
20:39:21 <Snipa> Whoops.
20:39:40 <asymptotically> oh fork