[Back to Index]

  
[00:07] <-- Yuv422 left irc: Quit: Yuv422
[00:13] <-- waltervn left irc: Quit: Leaving
[01:17] <-- SylvainTV left irc: Read error: Connection reset by peer
[01:30] <-- Joefish left irc: Ping timeout: 260 seconds
[01:30] --> Joefish joined #scummvm.
[01:30] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[01:41] <-- Dominus left irc: Ping timeout: 260 seconds
[01:41] --> Dominus joined #scummvm.

[02:58] --> dreammaster joined #scummvm.
[02:58] #scummvm: mode change '+o dreammaster' by ChanServ!ChanServ@services.
[04:13] <-- Joefish left irc: Ping timeout: 265 seconds
[04:22] <-- dreammaster left irc:
[05:09] --> K4T joined #scummvm.
[05:46] <-- SupSuper left irc: Quit: Rip
[06:19] --> Yuv422 joined #scummvm.
[06:56] <-- Yuv422 left irc: Quit: Yuv422
[07:02] <-- TMM left irc: Remote host closed the connection
[07:07] --> ny00123 joined #scummvm.
[07:27] <Strangerke|work> hi guys
[07:28] <-- Lightkey left irc: Ping timeout: 260 seconds
[07:39] <-- ny00123 left irc: Quit: Leaving
[07:42] --> Lightkey joined #scummvm.
[07:53] --> waltervn joined #scummvm.
[07:53] #scummvm: mode change '+o waltervn' by ChanServ!ChanServ@services.
[08:27] --> ignalina joined #scummvm.
[08:41] --> Joefish joined #scummvm.
[08:41] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[09:07] <-- Drenn left irc: Ping timeout: 240 seconds
[10:11] <-- Joefish left irc: Ping timeout: 265 seconds
[10:49] --> Joefish joined #scummvm.
[10:49] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[10:52] --> t0by joined #scummvm.
[10:52] #scummvm: mode change '+o t0by' by ChanServ!ChanServ@services.
[10:52] <-- t0by left irc: Quit: Leaving
[10:52] --> t0by joined #scummvm.
[10:52] #scummvm: mode change '+o t0by' by ChanServ!ChanServ@services.
[11:22] --> SupSuper joined #scummvm.
[11:28] --> ccawley2011 joined #scummvm.
[11:41] <-- ccawley2011 left irc: Ping timeout: 252 seconds
[11:45] --> ccawley2011 joined #scummvm.
[12:23] <-- ignalina left irc: Quit: My MacBook has gone to sleep. ZZZzzz&
[12:35] --> ignalina joined #scummvm.
[12:35] <-- ignalina left irc: Client Quit
[12:50] --> ny00123 joined #scummvm.
[12:58] --> ignalina joined #scummvm.
[13:11] <-- ignalina left irc: Quit: My MacBook has gone to sleep. ZZZzzz&
[13:44] --> Littleboy joined #scummvm.
[13:44] #scummvm: mode change '+o Littleboy' by ChanServ!ChanServ@services.
[13:46] --> ignalina joined #scummvm.
[14:14] --> GitHub173 joined #scummvm.
[14:14] <GitHub173> [scummvm] whiterandrek pushed 3 new commits to master: https://git.io/fNju1
[14:14] <GitHub173> scummvm/master 5f462c1 Andrei Prykhodko: PINK: implemented skipString method in Archive
[14:14] <GitHub173> scummvm/master d60265d Andrei Prykhodko: PINK: removed unused parameter
[14:14] <GitHub173> scummvm/master 736e94c Andrei Prykhodko: PINK: JANITORIAL: fixed local vars naming
[14:14] GitHub173 (GitHub173@gateway/service/github.com/x-gkieelmfzvkmaiiz) left #scummvm.
[14:30] --> GitHub112 joined #scummvm.
[14:30] <GitHub112> [scummvm] whiterandrek pushed 1 new commit to master: https://git.io/fNjg3
[14:30] <GitHub112> scummvm/master c8d3af3 Andrei Prykhodko: PINK: removed some unnecessary forward declarations
[14:30] GitHub112 (GitHub112@gateway/service/github.com/x-zhrjcbytpbvmmzbg) left #scummvm.
[14:53] <-- Joefish left irc: Remote host closed the connection
[15:09] <-- ignalina left irc: Quit: My MacBook has gone to sleep. ZZZzzz&
[15:19] --> ignalina joined #scummvm.
[15:25] <-- ny00123 left irc: Quit: Leaving
[16:19] <-- ignalina left irc: Quit: My MacBook has gone to sleep. ZZZzzz&
[16:22] <-- Littleboy left irc: Ping timeout: 272 seconds
[16:30] --> ignalina joined #scummvm.
[17:54] --> Littleboy joined #scummvm.
[17:54] #scummvm: mode change '+o Littleboy' by ChanServ!ChanServ@services.
[17:58] <-- Littleboy left irc: Ping timeout: 240 seconds
[17:58] --> SylvainTV joined #scummvm.
[17:58] #scummvm: mode change '+o SylvainTV' by ChanServ!ChanServ@services.
[18:51] --> LubomirR joined #scummvm.
[19:13] <-- ST left irc: Read error: Connection reset by peer
[19:14] --> ST joined #scummvm.
[19:14] #scummvm: mode change '+o ST' by ChanServ!ChanServ@services.
[19:45] <-- bonki left irc: Ping timeout: 250 seconds
[19:48] --> bonki joined #scummvm.
[19:48] #scummvm: mode change '+o bonki' by ChanServ!ChanServ@services.
[19:53] --> Drenn joined #scummvm.
[19:54] --> Littleboy joined #scummvm.
[19:54] #scummvm: mode change '+o Littleboy' by ChanServ!ChanServ@services.
[19:57] <-- ignalina left irc: Quit: Textual IRC Client: www.textualapp.com
[20:10] --> Deledrius_ joined #scummvm.
[20:13] <-- Deledrius left irc: Ping timeout: 268 seconds
[20:14] --> lb_ii joined #scummvm.
[20:14] <lb_ii> hi!
[20:20] Nick change: Deledrius_ -> Deledrius
[20:30] --> ignalina joined #scummvm.
[20:35] <lb_ii> t0by: https://github.com/scummvm/scummvm/pull/1284 is this rebase OK or should I try again?
[20:35] <t0by> lb_ii, don't worry, I'll take care of it myself later
[20:36] <t0by> Just one thing: We Hate Rebase Commits.
[20:37] <t0by> *Merge Commits
[20:37] <t0by> Now that I notice, it _should_ be on the guide (http://wiki.scummvm.org/index.php/Developer_Central#Pull_Request_approval_process), but it's apparently not.
[20:40] <lb_ii> could you tell more about rebase commit and merge commits?
[20:42] <lb_ii> I'm not absolutely new to git, but I've used different source control system for many years since I used git at some previous job
[20:43] <lb_ii> I also never used git flow for hobby projects, all my repos are one-branched, SVN-style repos just to track changes
[20:45] <lb_ii> so I understand what is possible and able to google it, but I can't tell right from wrong in terms of git practices
[20:49] <t0by> lb_ii, I'm sorry, I can't do this right now. Within the next 24 hours I'll rewrite your history _and_ tell you what I did and why
[20:50] <t0by> Merge commits are essentially graph nodes that have in-degree >= 2
[20:50] <lb_ii> ok, sure
[20:50] <t0by> i.e. as the name suggests they merge two different lines of history
[20:52] <t0by> The git manual is pretty exhaustive about rebase (https://git-scm.com/docs/git-rebase), but usually we use rebase for:
[20:53] <t0by> 1. Adding our modifications _on top_ of a branch that has a common ancestor with ours (e.g. when somebody else adds something to the master branch), so that we can include our the modifications _without_ nasty merge commits
[20:53] <t0by> 2. Use rebase --interactive to rewrite the past, reorder commits, reword and amend them
[20:54] <t0by> A key tool here is a gui that will make the process of altering individual commits on a per-line basis
[20:54] <t0by> (You can do that from command line too, but...)
[20:54] <lb_ii> I see...
[20:55] <t0by> So, next time you have a commit you want to split in three, pop up a gui like git-cola
[20:55] <lb_ii> sweeet!
[20:55] <t0by> Go into amend mode to amend the previous commit, unstage all lines minus the ones related to Foo, commit, then stage those related to Bar, commit, finally stage those related to Baz and commit.
[20:56] <lb_ii> always wanted a git GUI... T__T
[20:56] <t0by> I like git-cola in that it automates the parts that are ugly to do via command line.
[20:56] <t0by> I find it's best used in conjunction with the command line.
[20:57] <t0by> Anyway, I'm back to Real Work (tm) that I'm doing, I'll clean up your branch _and_ show you how later
[20:57] <lb_ii> ok, thanks a lot!
[20:57] <t0by> No, thank you for your contribution.
[20:57] <t0by> How's the rest coming along?
[20:58] <lb_ii> have not worked on those 4 issues yet
[20:59] <lb_ii> had some Real Work (tm) too 8)
[22:05] <-- LubomirR left irc: Quit: Leaving
[22:12] <-- waltervn left irc: Quit: Leaving
[22:13] <-- K4T left irc: Ping timeout: 268 seconds
[23:42] --> Joefish joined #scummvm.
[23:42] #scummvm: mode change '+v Joefish' by ChanServ!ChanServ@services.
[23:44] <-- ccawley2011 left irc: Quit: Page closed
[23:53] <-- ignalina left irc: Quit: Textual IRC Client: www.textualapp.com
[00:00] --- Sat Aug 18 2018