| 00:24.33 | *** join/#bzflag brlcad (~sean@66-118-151-70.static.sagonet.net) |
| 01:33.08 | *** join/#bzflag timvisher (~tim.vishe@pool-72-92-23-217.phlapa.fios.verizon.net) |
| 01:54.22 | allejo | BulletCatcher, want to remove the .gitattributes file? i forgot about windows stuff |
| 01:55.49 | allejo | i don't mind having a master branch being a README but it goes against git conventions so to speak |
| 01:56.16 | allejo | at least have the 2_4_x be the default branch since that's the only branch that still gets some activity |
| 01:57.56 | allejo | i'm not sure if you saw my suggestion last time, BC, but I suggested renamed import 3 to be the final branch and just a force push to it so pull requests and issues would remain there |
| 01:58.20 | allejo | we'll be breaking cloned versions anyways |
| 02:08.20 | *** join/#bzflag dngor (~abuse@p3m/dngor) |
| 02:18.36 | *** join/#bzflag dngor (~abuse@c-73-179-11-69.hsd1.fl.comcast.net) |
| 02:18.39 | *** join/#bzflag dngor (~abuse@p3m/dngor) |
| 02:23.41 | *** join/#bzflag dngor (~abuse@p3m/dngor) |
| 03:09.15 | BulletCatcher | If you don't mind, removing .gitattributes will solve the immediate problem. |
| 03:10.44 | allejo | I don't mind, I kinda just rushed to that commit. my bad |
| 03:10.57 | BulletCatcher | Pushing the import-8 repo commits into the import-3 container is one possible way forward. |
| 03:11.28 | BulletCatcher | I just don't know of an easy way to test how well it would work. |
| 03:11.50 | allejo | force push into import-7? |
| 03:12.41 | BulletCatcher | That would give us some idea, at least. |
| 03:12.52 | Not-5450 | [02bzflag-import-3] 07allejo pushed 031 commit to 03v2_4_x [+0/-1/±0] 13http://git.io/vvAvd |
| 03:12.54 | Not-5450 | [02bzflag-import-3] 07allejo 034809a47 - Jumped the gun, don't mess with MS line endings |
| 03:13.24 | BulletCatcher | Thanks. |
| 03:13.38 | allejo | :) |
| 03:14.01 | allejo | blast brought up the concern that forks could be out of sync if we force push into import-3 so i wouldn't know how to test that |
| 03:17.21 | BulletCatcher | One possibility is to copy the information from the issues into the repo's wiki to preserve it for posterity. |
| 03:17.23 | BulletCatcher | Then we would just delete import-3. |
| 03:19.08 | allejo | that could work |
| 03:19.14 | BulletCatcher | We could help people with forks rebase their commits onto forks of the final repo. |
| 03:49.58 | allejo | shouldn't be too hard |
| 04:03.20 | BulletCatcher | It isn't. |
| 04:05.48 | allejo | you know, sometimes your impeccable grammar makes me feel like i'm in trouble lol |
| 04:14.35 | BulletCatcher | dude! |
| 04:14.41 | BulletCatcher | (Does that help?) |
| 04:15.04 | allejo | lmao |
| 04:15.10 | allejo | ~BulletCatcher++ |
| 04:15.31 | kierra | Lol! |
| 05:55.00 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 10:05.51 | *** join/#bzflag timvisher (~tim.vishe@pool-72-92-23-217.phlapa.fios.verizon.net) |
| 10:59.24 | *** join/#bzflag zuii (~akos@BC06BF93.catv.pool.telekom.hu) |
| 12:06.45 | *** join/#bzflag brlcad (~sean@66-118-151-70.static.sagonet.net) |
| 15:56.53 | *** join/#bzflag zuii (~akos@BC06BF93.catv.pool.telekom.hu) |
| 16:11.51 | *** join/#bzflag zuii (~akos@BC06BF93.catv.pool.telekom.hu) |
| 16:23.41 | *** join/#bzflag zuii (~akos@BC06BF93.catv.pool.telekom.hu) |
| 17:09.58 | *** join/#bzflag tannerld (~tannerld@c-98-234-107-216.hsd1.ca.comcast.net) |
| 17:21.56 | *** join/#bzflag contempt (contempt@unaffiliated/contempt) |
| 19:00.17 | BulletCatcher | The most recent import-3 commits are now included in import-8. |
| 19:40.25 | Not-5450 | [02bzflag-import-3] 07JMakey pushed 031 commit to 03v2_4_x [+0/-0/±1] 13http://git.io/vvhho |
| 19:40.27 | Not-5450 | [02bzflag-import-3] 07JMakey 036766b83 - Include the .editorconfig file in distributions. |
| 20:00.37 | allejo | yayy |
| 20:21.19 | *** join/#bzflag [Gort] (~gort@82-69-126-225.dsl.in-addr.zen.co.uk) |
| 20:21.19 | *** join/#bzflag [Gort] (~gort@unaffiliated/gort/x-9231432) |
| 23:00.50 | *** join/#bzflag tannerld (~tannerld@c-98-234-107-216.hsd1.ca.comcast.net) |
| 23:03.55 | *** join/#bzflag nitroxis (n@nxs.re) |