| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** peres has joined #tp | 03:31 | |
| *** verhoevenv has quit IRC | 03:32 | |
| *** JohnSGalt has quit IRC | 03:43 | |
| *** glew has quit IRC | 03:47 | |
| *** StupidIncarnate has quit IRC | 04:50 | |
| *** StupidIncarnate has joined #tp | 05:11 | |
| *** bisc has joined #tp | 05:28 | |
| *** peres has quit IRC | 06:09 | |
| *** peres has joined #tp | 06:10 | |
| *** bisc has quit IRC | 06:19 | |
| *** Epyon has quit IRC | 06:42 | |
| *** peres has quit IRC | 07:13 | |
| *** cahirwpz has joined #tp | 07:27 | |
| *** Epyon has joined #tp | 07:50 | |
| *** peres has joined #tp | 08:13 | |
| *** Epyon has quit IRC | 08:22 | |
| *** null_000 has joined #tp | 08:47 | |
| *** peres has quit IRC | 08:51 | |
| *** bisc has joined #tp | 09:10 | |
| *** llnz has joined #tp | 09:26 | |
| llnz | hi all | 09:37 |
|---|---|---|
| null_000 | hi llnz | 09:51 |
| *** Epyon has joined #tp | 09:51 | |
| llnz | hi null_000 | 10:03 |
| llnz | how is it going? | 10:03 |
| llnz | hi Epyon | 10:03 |
| *** null_000 has quit IRC | 10:22 | |
| *** null_000 has joined #tp | 10:28 | |
| *** peres has joined #tp | 10:40 | |
| * llnz wanders off | 10:52 | |
| llnz | later all | 10:52 |
| *** llnz has quit IRC | 10:52 | |
| *** peres has quit IRC | 10:54 | |
| *** Epyon has quit IRC | 10:56 | |
| *** cahirwpz has quit IRC | 11:05 | |
| *** null_000 has quit IRC | 12:04 | |
| *** tansell-laptop has joined #tp | 12:42 | |
| *** tansell-laptop has quit IRC | 13:07 | |
| *** StrangerDanger has joined #tp | 13:18 | |
| *** peres has joined #tp | 13:37 | |
| *** verhoevenv has joined #tp | 13:40 | |
| *** StrangerDanger has quit IRC | 13:44 | |
| *** null_000 has joined #tp | 14:11 | |
| *** StrangerDanger has joined #tp | 14:51 | |
| *** StrangerDanger has quit IRC | 14:59 | |
| *** null_000 has quit IRC | 15:15 | |
| *** Epyon has joined #tp | 15:39 | |
| *** null_000 has joined #tp | 15:49 | |
| *** StrangerDanger has joined #tp | 16:05 | |
| *** StrangerDanger has quit IRC | 16:41 | |
| *** bisc has quit IRC | 16:49 | |
| *** bisc has joined #tp | 17:02 | |
| *** StrangerDanger has joined #tp | 17:04 | |
| *** cahirwpz has joined #tp | 17:19 | |
| * Epyon stabs cahirwpz | 17:19 | |
| * StrangerDanger witnesses a murder | 17:20 | |
| * Epyon feasts on the corpse. | 17:21 | |
| StupidIncarnate | :o zombie | 17:32 |
| Epyon | See? He's dead :) | 17:35 |
| StupidIncarnate | no you're the zombie | 17:38 |
| StupidIncarnate | who else would feast on the corpse? | 17:38 |
| * epyon-kitsune would! | 17:41 | |
| *** glew has joined #tp | 18:03 | |
| *** peres has quit IRC | 18:26 | |
| *** bisc has quit IRC | 19:06 | |
| *** StupidIncarnate has quit IRC | 20:36 | |
| *** StupidIncarnate has joined #tp | 20:45 | |
| *** cahirwpz has quit IRC | 21:06 | |
| *** llnz has joined #tp | 21:08 | |
| llnz | morning all | 21:10 |
| StupidIncarnate | morning | 21:21 |
| StupidIncarnate | so llnz, i'm trying to pull the changes from github, but I'm not sure I'm doing it right | 21:27 |
| StupidIncarnate | I'm on the main branch | 21:27 |
| llnz | hi StupidIncarnate | 21:27 |
| StupidIncarnate | when I do a git pull Github master, I get this error error: Entry 'modules/games/minisec/minisec.cpp' not uptodate. Cannot merge. | 21:30 |
| llnz | odd | 21:32 |
| llnz | what does git status say? | 21:32 |
| llnz | about minisec.cpp that is | 21:32 |
| StupidIncarnate | it's modified I guess | 21:34 |
| StupidIncarnate | though I never made changes to it | 21:34 |
| StupidIncarnate | it says a bunch of my files are modified | 21:34 |
| llnz | normally git gives a hint there how to undo the changes (if you want to undo them) | 21:35 |
| llnz | git diff to see the changes themselves | 21:35 |
| StupidIncarnate | I reverted changes, think that worked | 21:38 |
| verhoevenv | You can also stash the changes in a temporary commit, checkout, then re-apply the changes. I think. | 21:54 |
| verhoevenv | git help stash | 21:54 |
| *** null_000 has quit IRC | 21:54 | |
| verhoevenv | (if these are changes you might want to keep of course) | 21:55 |
| * epyon-kitsune can't get the reason why there is an option in tpserver not to start the network -_- | 22:06 | |
| llnz | brb, meeting | 22:32 |
| epyon-kitsune | llnz: any reason why settings like NEVER_START and network_start = false are supported? | 23:22 |
| * llnz is back | 23:23 | |
| llnz | NEVER_START is used by --help and --version commandline options to exit the server before doing anything | 23:23 |
| epyon-kitsune | um... I'm sure there must be a nicer way to do that -_- | 23:23 |
| llnz | network_start was for configuring the server before the players connect | 23:23 |
| epyon-kitsune | was? | 23:25 |
| epyon-kitsune | also, llnz, it seems I still do not have access to git, or I'm doing something wrong :/ | 23:27 |
| epyon-kitsune | maybe because I've cloned the github repo | 23:28 |
| Epyon | and now it doesn't want to push to the tp repo | 23:28 |
| llnz | you could branch on github (on the site) and push up there | 23:29 |
| epyon-kitsune | seems it is the best way... | 23:30 |
| epyon-kitsune | could you give me a hand on how to do that? | 23:30 |
| llnz | i will try | 23:41 |
| llnz | go to the webpage for the repo (ie http://github.com/thousandparsec/tpserver-cpp) | 23:42 |
| tpb | Title: thousandparsec's tpserver-cpp at master - GitHub (at github.com) | 23:42 |
| Epyon | Fork? | 23:43 |
| llnz | click fork | 23:43 |
| Epyon | done | 23:43 |
| llnz | now that page you are now on has an SSH url (note says "Read+Write" access) | 23:44 |
| Epyon | yep | 23:44 |
| Epyon | clone it? | 23:45 |
| llnz | you shouldn't need to | 23:46 |
| llnz | you should be able to use the instructions under "Existing Git Repo?" on this page http://help.github.com/creating-a-repo/ | 23:46 |
| tpb | Title: Help.GitHub - Creating a repo (at help.github.com) | 23:46 |
| llnz | namely, add it as a new remote (git remote add remotename url) | 23:47 |
| llnz | and pull and push to it | 23:47 |
| llnz | actually | 23:47 |
| llnz | this page has better instructions i think under "upstream" http://help.github.com/forking/ | 23:48 |
| tpb | Title: Help.GitHub - Forking a project (at help.github.com) | 23:48 |
| Epyon | To [email protected]:epyon/tpserver-cpp.git ! [rejected] master -> master (non-fast forward) error: failed to push some refs to '[email protected]:epyon/tpserver-cpp.git' | 23:53 |
| Epyon | hmm | 23:53 |
| llnz | try pulling first? | 23:55 |
| Epyon | parfecto ^^ | 23:55 |
| llnz | probably the commits a couple of nights ago from me | 23:55 |
| Epyon | Ok | 23:55 |
| Epyon | now I need to gather all the changes from all the repos and push them -_- | 23:56 |
| Epyon | also, the new files are untracked. | 23:56 |
| epyon-kitsune | thanks llnz! | 23:58 |
| llnz | no problem | 23:58 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!