| 01:38.31 | *** join/#bzflag infobot (ibot@208.53.50.136) |
| 01:38.31 | *** 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 |
| 01:38.31 | *** mode/#bzflag [+v infobot] by ChanServ |
| 01:55.05 | *** join/#bzflag Delusional (~Delusiona@unaffiliated/delusional) |
| 02:23.26 | JeffM | makes a 3DRadar, https://www.hyperdrive.tech/artbox/frontiers/posts/2018.07.20-19.14.mp4 |
| 02:36.49 | *** join/#bzflag Delusional (~Delusiona@unaffiliated/delusional) |
| 07:27.17 | *** join/#bzflag disco- (~disco@unaffiliated/disco-) |
| 10:13.50 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 16:41.20 | *** join/#bzflag Swant (swant@freenode/staff/ikea) |
| 19:03.03 | *** join/#bzflag The_Noah (~The_Noah@cpe-97-99-253-228.tx.res.rr.com) |
| 19:04.08 | The_Noah | How do I backport 2.5 to 2.4? |
| 19:42.29 | blast007 | what are you trying to do? |
| 19:46.47 | blast007 | The_Noah: is there a specific feature you're trying to pull from 2.5 and put into 2.4? |
| 19:47.09 | The_Noah | Take my 2.5 moded version and backport it to 2.4. |
| 19:47.34 | blast007 | what kinds of changes? is it stuff that depends on features in 2.5? |
| 19:47.50 | The_Noah | No, it doesn't depend on anything in 2.5. |
| 19:48.13 | blast007 | then just make a diff via 'git diff' and try to apply that diff against a 2.4 codebase |
| 19:48.22 | The_Noah | Okay. |
| 19:53.22 | The_Noah | Somehow my 2.4 branch got messed up, so is there a way to get everything from the original to my fork without losing a branch I added? |
| 19:57.04 | blast007 | make a copy of your entire clone in case you mess it up further and then try fixing it |
| 19:58.04 | The_Noah | Okay. |
| 21:56.31 | JeffM | Rebase to the root branch |