| 00:55.09 | *** join/#bzflag infobot (ibot@208.53.50.136) |
| 00:55.09 | *** topic/#bzflag is https://BZFlag.org || http://ohloh.net/p/bzflag || https://bzflag.org/help || Channel Logs: http://infobot.rikers.org/%23bzflag/ || 2.4.14 released! https://forums.bzflag.org/viewtopic.php?f=62&t=19953 |
| 00:55.09 | *** mode/#bzflag [+v infobot] by ChanServ |
| 02:42.08 | Flash | so maybe one of my problems is I don't have a local master branch |
| 02:46.51 | Flash | I gave up ... deleted my fork |
| 02:59.07 | *** mode/#bzflag [+o brlcad] by ChanServ |
| 03:05.13 | Flash | allejo: are you going to create the CONTRIBUTING.md? |
| 03:05.23 | Flash | I can try if you don't |
| 03:11.03 | Flash | wow ... hi brlcad |
| 03:11.11 | Flash | missed you joining earlier |
| 03:11.15 | Flash | been a while |
| 03:28.42 | allejo | I can write one up if you'd like me to. otherwise you're free to go for it and we can discuss any edits in a PR :) |
| 03:32.42 | Flash | where are my git ninjas? |
| 03:33.08 | Flash | I'm trying to push to my newly created fork and github is giving me an authentication error |
| 03:33.17 | allejo | throws a shuriken |
| 03:33.53 | allejo | what's the error say? |
| 03:34.35 | Flash | remote: Invalid username or password. |
| 03:35.41 | allejo | if you do `git remote show origin` does it show git@github.com or https://github.com |
| 03:36.14 | Flash | https |
| 03:36.43 | Flash | I found https://stackoverflow.com/questions/24551561/git-push-authentication-fails and tried to change to git@ but failed |
| 03:37.16 | allejo | if you run `ssh git@github.com` what happens? |
| 03:37.37 | Flash | Hi jwmelto! You've successfully authenticated, but GitHub does not provide shell access. |
| 03:38.38 | allejo | if you change the remote to use git@github.com instead, what happens? |
| 03:38.53 | allejo | git remote set-url origin git@github.com:jwmelto/bzflag.git |
| 03:40.01 | Flash | well that works ... not what stack overflow told me to do |
| 03:40.15 | Flash | you da Ninja! |
| 03:40.23 | Flash | ~allejo++ |
| 03:40.52 | allejo | :) |
| 03:41.17 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-pplnppoysrmkdwqn) |
| 03:41.17 | BZnotify | [13bzflag] 15jwmelto opened pull request #175: refactor TimeKeeper to use std::chrono (06master...06master) 02https://git.io/fNKJU |
| 03:41.17 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-pplnppoysrmkdwqn) |
| 03:41.32 | Flash | that was an experience :) |
| 03:52.55 | Flash | why does github want to default me to the 2.4 branch? |
| 03:54.17 | allejo | our github repo is set to have 2.4 as the "default" branch |
| 03:54.24 | allejo | we just haven't changed it to master yet |
| 03:54.33 | Flash | that would explain it, I guess |
| 03:54.40 | Flash | how can I change *my* repo? |
| 03:57.08 | Flash | and do you want to critique https://github.com/jwmelto/bzflag/blob/master/CONTRIBUTING.md |
| 04:03.38 | allejo | in your repo go to Settings > Branches |
| 04:03.47 | allejo | and then you should be able to choose the default branche there |
| 04:04.42 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-buksvntdgkbohiit) |
| 04:04.42 | BZnotify | [13bzflag] 15allejo closed pull request #174: refactor TimeKeeper to use std::chrono (06master...06master) 02https://git.io/fNr0f |
| 04:04.42 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-buksvntdgkbohiit) |
| 04:06.35 | allejo | I'd recommend the contributing.md commit be a separate PR |
| 04:06.46 | allejo | so changes to that or chrono don't block the other |
| 04:06.47 | Flash | planning on it |
| 04:07.29 | allejo | and this is a prime example of why you should have separate branches. one for chrono and the other for contributing :D |
| 04:07.53 | Flash | hey ... I'm lucky to get this configured at all! |
| 04:08.00 | Flash | and I can do that |
| 04:09.25 | allejo | hehe |
| 04:12.22 | Flash | but besides that, do you have any additions/deletions to CONTRIBUTING? |
| 04:21.00 | allejo | yah i had some thoughts when I skimmed it. think my first one was the example URL for cloning a fork had your username |
| 04:21.16 | allejo | and i think a github url had a '::' instead of '://' |
| 04:21.43 | Flash | it shouldn't; I copy/pasted it |
| 04:21.59 | Flash | good catch on the username |
| 04:22.00 | allejo | line 5 |
| 04:22.54 | Flash | well that was stupid |
| 04:23.44 | Flash | thanks for the nits .... anything more substantive? major missing info? |
| 04:24.59 | allejo | in the "Fork the Project" i'd reword the last part and enforce the concept of making a branch for your changes. so a note of that and a sample command, `git checkout -b feature/<branch-name>` |
| 04:25.19 | allejo | but prior to that, have another section that recommends creating an issue on what you plan on working on |
| 04:25.44 | allejo | so you can get feedback and/or approval/rejection for the idea. wouldn't want people wasting their time to get a PR rejected |
| 04:26.31 | allejo | or a situation like a recent PR of displaying shot limits where we don't know where to put it, and there weren't any mocks or discussion of where to put it. so essentially, it's just wasting their time with making code changes |
| 04:27.27 | allejo | also mention DEVINFO both for a general structure of the project and the code style guide |
| 04:27.49 | allejo | while we finally can automate the format, the less we need to do that after a PR is merged, the better :) |
| 04:27.52 | Flash | can you give me some words? |
| 04:28.09 | allejo | toast, potato, computer, mail |
| 04:32.03 | Flash | toast is cool |
| 04:33.11 | allejo | words for which part did you want? |
| 04:33.30 | Flash | anything you want to contribute |
| 04:33.41 | Flash | or I just submit it and you update |
| 04:33.47 | Flash | I'm making some mods |
| 04:35.58 | Flash | https://github.com/jwmelto/bzflag/blob/contrib/CONTRIBUTING.md |
| 04:43.16 | allejo | under "code the fix" mention DEVINFO for style and structure of the project. overall, content and structure of the document work. i'd probably change wording of some stuff here and there |
| 04:52.24 | Flash | bleah ... we still deprecate exceptions? that needs fixing |
| 04:52.53 | allejo | hmm? |
| 04:53.13 | Flash | These should still be avoided: |
| 04:53.13 | Flash | <PROTECTED> |
| 04:55.21 | allejo | i'd think that could be revisited since we've started using c++11 as a min req, or at least that was planned iirc |
| 05:27.37 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-ewjnpotrdhtxutwy) |
| 05:27.37 | BZnotify | [13bzflag] 15jwmelto created 06contrib from 06master (+0 new commits): 02https://git.io/fNKIJ |
| 05:27.37 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-ewjnpotrdhtxutwy) |
| 05:28.09 | Flash | bleah ... didn't mean to actually create the pull request |
| 05:30.34 | Flash | for allejo: https://github.com/jwmelto/bzflag/blob/contrib/CONTRIBUTING.md |
| 06:00.22 | *** join/#bzflag Dracos85 (~dracos85@24-119-188-49.cpe.cableone.net) |
| 07:30.01 | Flash | ok allejo ... I need more git-ninja-fu ... I created a pull request from my branch, but it isn't showing up anywhere |
| 07:30.29 | Flash | or ... it's just on my fork |
| 07:35.22 | allejo | maybe you opened the PR against your own fork instead of the main bz repo? |
| 07:36.48 | allejo | Iâm about to head to bed so Iâll take a look at contributing doc in the morning pending any other feedback from others :D |
| 07:49.29 | *** join/#bzflag AAA_awright (~aaa@2607:5300:60:7d4::1) |
| 11:42.45 | *** join/#bzflag alezakos (~kongr45gp@bzflag/developer/alezakos) |
| 14:30.13 | *** join/#bzflag The_Noah (~The_Noah@cpe-97-99-253-228.tx.res.rr.com) |
| 15:05.29 | *** join/#bzflag Dracos85 (~dracos85@24-119-188-49.cpe.cableone.net) |
| 15:07.19 | *** join/#bzflag Dracos85 (~dracos85@24-119-188-49.cpe.cableone.net) |
| 15:07.58 | brlcad | hello Flash |
| 15:11.34 | *** join/#bzflag Dracos85 (~dracos85@24-116-38-202.cpe.cableone.net) |
| 17:31.31 | *** join/#bzflag macsforme (~macsforme@bzflag/developer/Constitution) |
| 17:31.31 | *** mode/#bzflag [+o macsforme] by ChanServ |
| 18:39.45 | *** join/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-ibzaqlwgnuhsywwn) |
| 18:39.45 | BZnotify | [13bzflag] 15blast007 04deleted 06contrib at 14e9957ce: 02https://git.io/fN68q |
| 18:39.45 | *** part/#bzflag BZnotify (BZnotify@gateway/service/github.com/x-ibzaqlwgnuhsywwn) |
| 22:35.44 | *** join/#bzflag spldart (~james@bzflag/contributor/spldart) |
| 22:35.44 | *** mode/#bzflag [+v spldart] by ChanServ |